aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-10-29 05:07:39 +0000
committerChong Yidong2008-10-29 05:07:39 +0000
commit78b6d6d2983c4f6b9d7e7239d36b7ddeedee96c0 (patch)
treedd5cbf08c291ad1cd56a0b4b1662a1edd50c08f8
parente670e599c17562cf4b3630043cbd4f26df374e0b (diff)
downloademacs-78b6d6d2983c4f6b9d7e7239d36b7ddeedee96c0.tar.gz
emacs-78b6d6d2983c4f6b9d7e7239d36b7ddeedee96c0.zip
Minor changes to last checkin.
-rw-r--r--doc/emacs/misc.texi30
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 3123d526bb3..5ab6ff4382c 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1392,10 +1392,10 @@ emacsclient -c +12 @var{file1} +4:3 @var{file2}
1392@end example 1392@end example
1393 1393
1394@noindent 1394@noindent
1395The @samp{+@var{linenum}} or @samp{+@var{linenum}:@var{columnnum}} 1395The @samp{+@var{line}} or @samp{+@var{line}:@var{column}} arguments
1396arguments specify line numbers, or line and column numbers, for the 1396specify line numbers, or line and column numbers, for the next file
1397next file argument. These behave like the command line arguments for 1397argument. These behave like the command line arguments for Emacs
1398Emacs itself. @xref{Action Arguments}. 1398itself. @xref{Action Arguments}.
1399 1399
1400 The other optional arguments recognized by @command{emacsclient} are 1400 The other optional arguments recognized by @command{emacsclient} are
1401listed below: 1401listed below:
@@ -1421,12 +1421,12 @@ precedence.
1421 1421
1422@item -c 1422@item -c
1423Create a new graphical frame, instead of using an existing Emacs 1423Create a new graphical frame, instead of using an existing Emacs
1424frame. Note that Emacs 23 can create a graphical frame even if it was 1424frame. Emacs 23 can create a graphical frame even if it was started
1425started in a text-only terminal, provided it is able to connect to a 1425in a text-only terminal, provided it is able to connect to a graphical
1426graphical display. If no graphical display is available, Emacs 1426display. If no graphical display is available, Emacs creates a new
1427creates a new text-only terminal frame (@pxref{Frames}). If you omit 1427text-only terminal frame (@pxref{Frames}). If you omit a filename
1428a filename argument while supplying the @samp{-c} option, the new 1428argument while supplying the @samp{-c} option, the new frame displays
1429frame displays the @samp{*scratch*} buffer (@pxref{Buffers}). 1429the @samp{*scratch*} buffer (@pxref{Buffers}).
1430 1430
1431@item -d @var{display} 1431@item -d @var{display}
1432@itemx --display=@var{display} 1432@itemx --display=@var{display}
@@ -1479,11 +1479,11 @@ server it finds. (This option is not supported on MS-Windows.)
1479@itemx --tty 1479@itemx --tty
1480@itemx -nw 1480@itemx -nw
1481Create a new Emacs frame on the current text-only terminal, instead of 1481Create a new Emacs frame on the current text-only terminal, instead of
1482using an existing Emacs frame. Note that Emacs 23 can open a 1482using an existing Emacs frame. Emacs 23 can open a text-only terminal
1483text-only terminal even if it was started in another text-only 1483even if it was started in another text-only terminal, or on a
1484terminal, or on a graphical display. If you omit a filename argument 1484graphical display. If you omit a filename argument while supplying
1485while supplying this option, the new frame displays the 1485this option, the new frame displays the @samp{*scratch*} buffer.
1486@samp{*scratch*} buffer. @xref{Buffers}. 1486@xref{Buffers}.
1487@end table 1487@end table
1488 1488
1489 If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in an 1489 If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in an