[Emacs-diffs] emacs/lib-src ChangeLog emacsclient.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/20 02:52:57

Modified files:
        lib-src        : ChangeLog emacsclient.c 

Log message:
        * emacsclient.c (print_help_and_exit): Clarify argument placement
        for short option names.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/ChangeLog?cvsroot=emacs&r1=2.526&r2=2.527
http://cvs.savannah.gnu.org/viewcvs/emacs/lib-src/emacsclient.c?cvsroot=emacs&r1=1.157&r2=1.158

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lib-src/ChangeLog,v
retrieving revision 2.526
retrieving revision 2.527
diff -u -b -r2.526 -r2.527
--- ChangeLog   2 Apr 2009 19:43:27 -0000       2.526
+++ ChangeLog   20 Apr 2009 02:52:56 -0000      2.527
@@ -1,3 +1,8 @@
+2009-04-20  Chong Yidong  <address@hidden>
+
+       * emacsclient.c (print_help_and_exit): Clarify argument placement
+       for short option names.
+
 2009-04-02  Dan Nicolaescu  <address@hidden>
 
        * emacsclient.c (print_help_and_exit): Fix typo.

Index: emacsclient.c
===================================================================
RCS file: /sources/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- emacsclient.c       2 Apr 2009 19:43:28 -0000       1.157
+++ emacsclient.c       20 Apr 2009 02:52:57 -0000      1.158
@@ -628,15 +628,16 @@
                        use the current Emacs frame\n\
 -e, --eval             Evaluate the FILE arguments as ELisp expressions\n\
 -n, --no-wait          Don't wait for the server to return\n\
--d, --display=DISPLAY  Visit the file in the given display\n"
+-d DISPLAY, --display=DISPLAY\n\
+                        Visit the file in the given display\n"
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
-"-s, --socket-name=FILENAME\n\
+"-s SOCKET, --socket-name=SOCKET\n\
                        Set filename of the UNIX socket for communication\n"
 #endif
-"-f, --server-file=FILENAME\n\
+"-f SERVER, --server-file=SERVER\n\
                        Set filename of the TCP authentication file\n\
--a, --alternate-editor=EDITOR\n\
-                       Editor to fallback to if the server is not running\n"
+-a EDITOR, --alternate-editor=EDITOR\n\
+                        Editor to fallback to if the server is not running.\n"
 #ifndef WINDOWSNT
 "                      If EDITOR is the empty string, start Emacs in daemon\n\
                        mode and try connecting again\n"