diff options
Diffstat (limited to 'doc/emacs')
-rw-r--r-- | doc/emacs/commands.texi | 13 | ||||
-rw-r--r-- | doc/emacs/text.texi | 41 |
2 files changed, 23 insertions, 31 deletions
diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index 4773d7675bd..17e0d20f358 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -118,13 +118,12 @@ C-k} is two key sequences, not one. By default, the prefix keys in Emacs are @kbd{C-c}, @kbd{C-h}, @kbd{C-x}, @kbd{C-x @key{RET}}, @kbd{C-x @@}, @kbd{C-x a}, @kbd{C-x n}, @kbd{C-x r}, @kbd{C-x v}, @kbd{C-x 4}, @kbd{C-x 5}, @kbd{C-x 6}, -@key{ESC}, @kbd{M-g}, and @kbd{M-o}. (@key{F1} and @key{F2} are -aliases for @kbd{C-h} and @kbd{C-x 6}.) This list is not cast in -stone; if you customize Emacs, you can make new prefix keys. You -could even eliminate some of the standard ones, though this is not -recommended for most users; for example, if you remove the prefix -definition of @kbd{C-x 4}, then @kbd{C-x 4 C-f} becomes an invalid key -sequence. @xref{Key Bindings}. +@key{ESC}, @kbd{M-g}, @kbd{M-o} and @key{F2}. (@key{F1} is an alias +for @kbd{C-h}.) This list is not cast in stone; if you customize +Emacs, you can make new prefix keys. You could even eliminate some of +the standard ones, though this is not recommended for most users; for +example, if you remove the prefix definition of @kbd{C-x 4}, then +@kbd{C-x 4 C-f} becomes an invalid key sequence. @xref{Key Bindings}. Typing the help character (@kbd{C-h} or @key{F1}) after a prefix key displays a list of the commands starting with that prefix. The sole diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 974f79d5232..a837b6580dd 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -2870,9 +2870,8 @@ of text. It uses two side-by-side windows, each showing its own buffer. There are three ways to enter two-column mode: @table @asis -@item @kbd{@key{F2} 2} or @kbd{C-x 6 2} +@item @kbd{@key{F2} 2} @kindex F2 2 -@kindex C-x 6 2 @findex 2C-two-columns Enter two-column mode with the current buffer on the left, and on the right, a buffer whose name is based on the current buffer's name @@ -2883,9 +2882,8 @@ changed. This command is appropriate when the current buffer is empty or contains just one column and you want to add another column. -@item @kbd{@key{F2} s} or @kbd{C-x 6 s} +@item @kbd{@key{F2} s} @kindex F2 s -@kindex C-x 6 s @findex 2C-split Split the current buffer, which contains two-column text, into two buffers, and display them side by side (@code{2C-split}). The current @@ -2898,21 +2896,19 @@ This command is appropriate when you have a buffer that already contains two-column text, and you wish to separate the columns temporarily. @item @kbd{@key{F2} b @var{buffer} @key{RET}} -@itemx @kbd{C-x 6 b @var{buffer} @key{RET}} @kindex F2 b -@kindex C-x 6 b @findex 2C-associate-buffer Enter two-column mode using the current buffer as the left-hand buffer, and using buffer @var{buffer} as the right-hand buffer (@code{2C-associate-buffer}). @end table - @kbd{@key{F2} s} or @kbd{C-x 6 s} looks for a column separator, which -is a string that appears on each line between the two columns. You can -specify the width of the separator with a numeric argument to -@kbd{@key{F2} s}; that many characters, before point, constitute the -separator string. By default, the width is 1, so the column separator -is the character before point. + @kbd{@key{F2} s} looks for a column separator, which is a string +that appears on each line between the two columns. You can specify +the width of the separator with a numeric argument to @kbd{@key{F2} +s}; that many characters, before point, constitute the separator +string. By default, the width is 1, so the column separator is the +character before point. When a line has the separator at the proper place, @kbd{@key{F2} s} puts the text after the separator into the right-hand buffer, and @@ -2924,25 +2920,22 @@ mode: write it in the left-hand buffer, and put an empty line in the right-hand buffer.) @kindex F2 RET -@kindex C-x 6 RET @findex 2C-newline - The command @kbd{@key{F2} @key{RET}} or @kbd{C-x 6 @key{RET}} -(@code{2C-newline}) inserts a newline in each of the two buffers at -corresponding positions. This is the easiest way to add a new line to -the two-column text while editing it in split buffers. + The command @kbd{@key{F2} @key{RET}} (@code{2C-newline}) inserts +a newline in each of the two buffers at corresponding positions. +This is the easiest way to add a new line to the two-column text while +editing it in split buffers. @kindex F2 1 -@kindex C-x 6 1 @findex 2C-merge When you have edited both buffers as you wish, merge them with -@kbd{@key{F2} 1} or @kbd{C-x 6 1} (@code{2C-merge}). This copies the +@kbd{@key{F2} 1} (@code{2C-merge}). This copies the text from the right-hand buffer as a second column in the other buffer. To go back to two-column editing, use @kbd{@key{F2} s}. @kindex F2 d -@kindex C-x 6 d @findex 2C-dissociate - Use @kbd{@key{F2} d} or @kbd{C-x 6 d} to dissociate the two buffers, -leaving each as it stands (@code{2C-dissociate}). If the other buffer, -the one not current when you type @kbd{@key{F2} d}, is empty, -@kbd{@key{F2} d} kills it. + Use @kbd{@key{F2} d} to dissociate the two buffers, leaving each as +it stands (@code{2C-dissociate}). If the other buffer, the one not +current when you type @kbd{@key{F2} d}, is empty, @kbd{@key{F2} d} +kills it. |