aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-11-27 16:56:33 +0000
committerDan Nicolaescu2008-11-27 16:56:33 +0000
commitfba1d2bef16981a18954b688356416cd390fe48d (patch)
tree4163acc3e794ab97cf52c4d572b0c2e8545f6520
parentcab8a1afac836defce9aa046c18cb26ea0ed9f7f (diff)
downloademacs-fba1d2bef16981a18954b688356416cd390fe48d.tar.gz
emacs-fba1d2bef16981a18954b688356416cd390fe48d.zip
Mention -nw and -c. Fix the character for --help.
Swap the order of -e and -n to follow the order displayed by --help.
-rw-r--r--doc/man/ChangeLog5
-rw-r--r--doc/man/emacsclient.114
2 files changed, 15 insertions, 4 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index c82a77d9973..a26d0f40a93 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,8 @@
12008-11-27 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * emacsclient.1: Mention -nw and -c. Fix the character for --help.
4 Swap the order of -e and -n to follow the order displayed by --help.
5
12008-03-13 Glenn Morris <rgm@gnu.org> 62008-03-13 Glenn Morris <rgm@gnu.org>
2 7
3 * emacs.1: Fix Emacs version. 8 * emacs.1: Fix Emacs version.
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 8852372dd75..ce5829d8d0d 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -48,14 +48,20 @@ If you set the variable `server-window' to a window or a frame, `C-x
48The programs follow the usual GNU command line syntax, with long 48The programs follow the usual GNU command line syntax, with long
49options starting with two dashes (`-'). 49options starting with two dashes (`-').
50.TP 50.TP
51.B \-n, \-\-no-wait 51.B \-nw, \-t, \-\-tty
52returns 52open a new Emacs frame on the current terminal
53immediately without waiting for you to "finish" the buffer in Emacs. 53.TP
54.B -c, \-\-create-frame
55create a new frame instead of trying to use the current Emacs frame
54.TP 56.TP
55.B \-e, \-\-eval 57.B \-e, \-\-eval
56do not visit files but instead evaluate the arguments as Emacs 58do not visit files but instead evaluate the arguments as Emacs
57Lisp expressions. 59Lisp expressions.
58.TP 60.TP
61.B \-n, \-\-no-wait
62returns
63immediately without waiting for you to "finish" the buffer in Emacs.
64.TP
59.B \-s, \-\-socket-name=FILENAME 65.B \-s, \-\-socket-name=FILENAME
60use socket named FILENAME for communication. 66use socket named FILENAME for communication.
61.TP 67.TP
@@ -73,7 +79,7 @@ tell the server to display the files on the given display.
73.B \-V, \-\-version 79.B \-V, \-\-version
74print version information and exit 80print version information and exit
75.TP 81.TP
76.B \-h, \-\-help 82.B \-H, \-\-help
77print this usage information message and exit 83print this usage information message and exit
78.SH "SEE ALSO" 84.SH "SEE ALSO"
79The program is documented fully in 85The program is documented fully in