diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-04-20 02:52:56 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-04-20 02:52:56 +0000 |
| commit | 24d5010d9f2e7d9ec49db5142bee4059df003386 (patch) | |
| tree | 27f77090dc202e1fdf3b276fde65a2e188499f3d | |
| parent | 02a8910302278075db62124e69e1fb0de7dcc9f7 (diff) | |
| download | emacs-24d5010d9f2e7d9ec49db5142bee4059df003386.tar.gz | |
* emacsclient.c (print_help_and_exit): Clarify argument placement
for short option names.
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cd7f3f8344d..697c5404cc2 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2009-04-20 Chong Yidong <cyd@stupidchicken.com> + + * emacsclient.c (print_help_and_exit): Clarify argument placement + for short option names. + 2009-04-02 Dan Nicolaescu <dann@ics.uci.edu> * emacsclient.c (print_help_and_exit): Fix typo. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 558427118e5..e35e35b9ff1 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -625,18 +625,19 @@ The following OPTIONS are accepted:\n\ -H, --help Print this usage information message\n\ -nw, -t, --tty Open a new Emacs frame on the current terminal\n\ -c, --create-frame Create a new frame instead of trying to\n\ - use the current Emacs frame\n\ + 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\ - Set filename of the UNIX socket for communication\n" +"-s SOCKET, --socket-name=SOCKET\n\ + Set filename of the UNIX socket for communication\n" #endif -"-f, --server-file=FILENAME\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" +"-f SERVER, --server-file=SERVER\n\ + Set filename of the TCP authentication file\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" |