Index: lib-src/emacsclient.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.58
diff -u -3 -r1.58 emacsclient.c
--- lib-src/emacsclient.c	12 Apr 2003 19:03:08 -0000	1.58
+++ lib-src/emacsclient.c	17 Jul 2003 14:23:08 -0000
@@ -438,13 +438,13 @@
   if (cwd == 0)
     {
       /* getwd puts message in STRING if it fails.  */
-      fprintf (stderr, "%s: %s (%s)\n", argv[0],
+     
 #ifdef HAVE_GETCWD
-	       "Cannot get current working directory",
+      fprintf (stderr, "%s: %s (%s)\n", argv[0],    
+	       "Cannot get current working directory",strerror (errno));
 #else
-	       string,
+      fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno));
 #endif
-	       strerror (errno));
       fail (argc, argv);
     }
 
Index: lib-src/etags.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/etags.c,v
retrieving revision 3.34
diff -u -3 -r3.34 etags.c
--- lib-src/etags.c	27 May 2003 20:13:22 -0000	3.34
+++ lib-src/etags.c	17 Jul 2003 14:23:11 -0000
@@ -6484,14 +6484,14 @@
 static void
 suggest_asking_for_help ()
 {
-  fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
-	   progname,
+  
 #ifdef LONG_OPTIONS
-	   "--help"
+fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
+	 progname, "--help");
 #else
-	   "-h"
+fprintf (stderr, "\tTry `%s %s' for a complete list of options.\n",
+	 progname,"-h");
 #endif
-	   );
   exit (BAD);
 }
 
Index: lib-src/movemail.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/movemail.c,v
retrieving revision 1.77
diff -u -3 -r1.77 movemail.c
--- lib-src/movemail.c	20 May 2003 16:34:35 -0000	1.77
+++ lib-src/movemail.c	17 Jul 2003 14:23:12 -0000
@@ -228,13 +228,12 @@
 #endif
       )
     {
-      fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n",
 #ifdef MAIL_USE_POP
-	       " [POP-password]"
+      fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n",
+	       " [POP-password]");
 #else
-	       ""
+      fprintf (stderr, "Usage: movemail [-p] inbox destfile%s\n", "");
 #endif
-	       );
       exit (1);
     }