aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorJuanma Barranquero2009-04-20 03:19:19 +0000
committerJuanma Barranquero2009-04-20 03:19:19 +0000
commit9dfda22f23342984d686e9c8cb85fa52e2183353 (patch)
tree6e54eac8f94c3678f1faeb95e51e7ba8ed28f2ee /lib-src
parent24d5010d9f2e7d9ec49db5142bee4059df003386 (diff)
downloademacs-9dfda22f23342984d686e9c8cb85fa52e2183353.tar.gz
emacs-9dfda22f23342984d686e9c8cb85fa52e2183353.zip
* emacsclient.c (print_help_and_exit): Fix typo and tabify (careful
spacing is required in the message output, as the comment suggests).
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/emacsclient.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 697c5404cc2..49ee64d55f1 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12009-04-20 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacsclient.c (print_help_and_exit): Fix typo and tabify (careful
4 spacing is required in the message output, as the comment suggests).
5
12009-04-20 Chong Yidong <cyd@stupidchicken.com> 62009-04-20 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * emacsclient.c (print_help_and_exit): Clarify argument placement 8 * emacsclient.c (print_help_and_exit): Clarify argument placement
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index e35e35b9ff1..a451c1b9ba4 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -625,19 +625,19 @@ The following OPTIONS are accepted:\n\
625-H, --help Print this usage information message\n\ 625-H, --help Print this usage information message\n\
626-nw, -t, --tty Open a new Emacs frame on the current terminal\n\ 626-nw, -t, --tty Open a new Emacs frame on the current terminal\n\
627-c, --create-frame Create a new frame instead of trying to\n\ 627-c, --create-frame Create a new frame instead of trying to\n\
628 use the current Emacs frame\n\ 628 use the current Emacs frame\n\
629-e, --eval Evaluate the FILE arguments as ELisp expressions\n\ 629-e, --eval Evaluate the FILE arguments as ELisp expressions\n\
630-n, --no-wait Don't wait for the server to return\n\ 630-n, --no-wait Don't wait for the server to return\n\
631-d DISPLAY, --display=DISPLAY\n\ 631-d DISPLAY, --display=DISPLAY\n\
632 Visit the file in the given display\n" 632 Visit the file in the given display\n"
633#ifndef NO_SOCKETS_IN_FILE_SYSTEM 633#ifndef NO_SOCKETS_IN_FILE_SYSTEM
634"-s SOCKET, --socket-name=SOCKET\n\ 634"-s SOCKET, --socket-name=SOCKET\n\
635 Set filename of the UNIX socket for communication\n" 635 Set filename of the UNIX socket for communication\n"
636#endif 636#endif
637"-f SERVER, --server-file=SERVER\n\ 637"-f SERVER, --server-file=SERVER\n\
638 Set filename of the TCP authentication file\n\ 638 Set filename of the TCP authentication file\n\
639-a EDITOR, --alternate-editor=EDITOR\n\ 639-a EDITOR, --alternate-editor=EDITOR\n\
640 Editor to fallback to if the server is not running.\n" 640 Editor to fallback to if the server is not running\n"
641#ifndef WINDOWSNT 641#ifndef WINDOWSNT
642" If EDITOR is the empty string, start Emacs in daemon\n\ 642" If EDITOR is the empty string, start Emacs in daemon\n\
643 mode and try connecting again\n" 643 mode and try connecting again\n"