diff options
| author | Eli Zaretskii | 2018-02-02 17:41:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-02-02 17:41:38 +0200 |
| commit | 6f495abd0d65075714f92b0eb7f637d6f540edfa (patch) | |
| tree | fc5e3a4ce563a9834a51db61a2b21ef9e3f74ed2 | |
| parent | 59344c43a92347387126fbf11fe8b4099b9bcebc (diff) | |
| download | emacs-6f495abd0d65075714f92b0eb7f637d6f540edfa.tar.gz emacs-6f495abd0d65075714f92b0eb7f637d6f540edfa.zip | |
Another round of manual fixups
* doc/emacs/killing.texi (Killing by Lines): Clarify wording.
Reported by David Bonnafous <dbonnafo@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/windows.texi (Other Window): Improve wording.
Reported by Rasmus Sjostrom <ras.sjostrom@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/display.texi (Display Custom): Mention that line
numbers are not displayed in the minibuffer and tooltips.
* doc/emacs/mini.texi (Basic Minibuffer): Improve wording.
* doc/emacs/regs.texi (Registers): More comma removal. Suggested
by "root@vxid.pw root@vxid.pw" <root@vxid.pw> in
emacs-manual-bugs@gnu.org.
* doc/emacs/display.texi (Auto Scrolling): Fix a typo. Reported
by Kevin Foley <kfoley15@gmail.com> in emacs-manual-bugs@gnu.org.
* doc/emacs/display.texi (Scrolling): Fix grammar.
(Horizontal Scrolling): Mention reasonable limits for hscroll-step
float values. Suggested by Jerome Truong <jerometruong@gmail.com>
in emacs-manual-bugs@gnu.org.
* doc/emacs/mini.texi (Minibuffer Edit): Add a missing comma.
* doc/emacs/basic.texi (Position Info, Arguments, Repeating):
Remove redundant commas. Suggested by oldgaro
<oldgaro@protonmail.com> in emacs-manual-bugs@gnu.org.
* doc/emacs/kmacro.texi (Save Keyboard Macro): Clarify wording.
Suggested by clemens.radermacher@posteo.de in
emacs-manual-bugs@gnu.org.
* doc/emacs/building.texi (Compilation Mode): Improve and simplify
wording. Suggested by drone <yoorobot@gmail.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/dired.texi (Dired Enter): Clarify wording.
(Dired Deletion): Fix a typo.
(Marks vs Flags): Mention that M-DEL in Dired asks for the mark
character. Fix typos.
* doc/emacs/basic.texi (Moving Point, Erasing, Basic Undo)
(Arguments): Some additional information about keys. Reported by
Francis Wright <f.j.wright@live.co.uk> in
emacs-manual-bugs@gnu.org.
| -rw-r--r-- | doc/emacs/basic.texi | 26 | ||||
| -rw-r--r-- | doc/emacs/building.texi | 15 | ||||
| -rw-r--r-- | doc/emacs/dired.texi | 23 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 17 | ||||
| -rw-r--r-- | doc/emacs/killing.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/kmacro.texi | 2 | ||||
| -rw-r--r-- | doc/emacs/mini.texi | 8 | ||||
| -rw-r--r-- | doc/emacs/regs.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/windows.texi | 6 |
9 files changed, 58 insertions, 45 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 55e0145d7d1..11be78de68b 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi | |||
| @@ -286,11 +286,14 @@ arguments. | |||
| 286 | @findex beginning-of-buffer | 286 | @findex beginning-of-buffer |
| 287 | Move to the top of the buffer (@code{beginning-of-buffer}). With | 287 | Move to the top of the buffer (@code{beginning-of-buffer}). With |
| 288 | numeric argument @var{n}, move to @var{n}/10 of the way from the top. | 288 | numeric argument @var{n}, move to @var{n}/10 of the way from the top. |
| 289 | On graphical displays, @kbd{C-@key{HOME}} does the same. | ||
| 289 | 290 | ||
| 290 | @item M-> | 291 | @item M-> |
| 291 | @kindex M-> | 292 | @kindex M-> |
| 293 | @kindex C-@key{END} | ||
| 292 | @findex end-of-buffer | 294 | @findex end-of-buffer |
| 293 | Move to the end of the buffer (@code{end-of-buffer}). | 295 | Move to the end of the buffer (@code{end-of-buffer}). On graphical |
| 296 | displays, @kbd{C-@key{END}} does the same. | ||
| 294 | 297 | ||
| 295 | @item C-v | 298 | @item C-v |
| 296 | @itemx @key{PageDown} | 299 | @itemx @key{PageDown} |
| @@ -401,9 +404,12 @@ Delete the character after point (@code{delete-char}). | |||
| 401 | 404 | ||
| 402 | @item C-k | 405 | @item C-k |
| 403 | Kill to the end of the line (@code{kill-line}). | 406 | Kill to the end of the line (@code{kill-line}). |
| 407 | |||
| 404 | @item M-d | 408 | @item M-d |
| 405 | Kill forward to the end of the next word (@code{kill-word}). | 409 | Kill forward to the end of the next word (@code{kill-word}). |
| 410 | |||
| 406 | @item M-@key{DEL} | 411 | @item M-@key{DEL} |
| 412 | @itemx M-@key{BACKSPACE} | ||
| 407 | Kill back to the beginning of the previous word | 413 | Kill back to the beginning of the previous word |
| 408 | (@code{backward-kill-word}). | 414 | (@code{backward-kill-word}). |
| 409 | @end table | 415 | @end table |
| @@ -448,12 +454,11 @@ commands. | |||
| 448 | 454 | ||
| 449 | @table @kbd | 455 | @table @kbd |
| 450 | @item C-/ | 456 | @item C-/ |
| 451 | Undo one entry of the undo records---usually, one command worth | 457 | @itemx C-x u |
| 452 | (@code{undo}). | ||
| 453 | |||
| 454 | @item C-x u | ||
| 455 | @itemx C-_ | 458 | @itemx C-_ |
| 456 | The same. | 459 | Undo one entry of the undo records---usually, one command worth |
| 460 | (@code{undo}). (The first key might be unavailable on text-mode | ||
| 461 | displays.) | ||
| 457 | @end table | 462 | @end table |
| 458 | 463 | ||
| 459 | Emacs records a list of changes made in the buffer text, so you can | 464 | Emacs records a list of changes made in the buffer text, so you can |
| @@ -655,7 +660,7 @@ Toggle automatic display of the size of the buffer. | |||
| 655 | @cindex cursor location | 660 | @cindex cursor location |
| 656 | @cindex point location | 661 | @cindex point location |
| 657 | @kbd{M-x what-line} displays the current line number in the echo | 662 | @kbd{M-x what-line} displays the current line number in the echo |
| 658 | area. This command is usually redundant, because the current line | 663 | area. This command is usually redundant because the current line |
| 659 | number is shown in the mode line (@pxref{Mode Line}). However, if you | 664 | number is shown in the mode line (@pxref{Mode Line}). However, if you |
| 660 | narrow the buffer, the mode line shows the line number relative to | 665 | narrow the buffer, the mode line shows the line number relative to |
| 661 | the accessible portion (@pxref{Narrowing}). By contrast, | 666 | the accessible portion (@pxref{Narrowing}). By contrast, |
| @@ -800,7 +805,7 @@ fills text; with an argument, it justifies the text as well. | |||
| 800 | commands, it is enough to specify the argument with a single | 805 | commands, it is enough to specify the argument with a single |
| 801 | @kbd{C-u}. | 806 | @kbd{C-u}. |
| 802 | 807 | ||
| 803 | Some commands use the value of the argument as a repeat count, but | 808 | Some commands use the value of the argument as a repeat count but |
| 804 | do something special when there is no argument. For example, the | 809 | do something special when there is no argument. For example, the |
| 805 | command @kbd{C-k} (@code{kill-line}) with argument @var{n} kills | 810 | command @kbd{C-k} (@code{kill-line}) with argument @var{n} kills |
| 806 | @var{n} lines, including their terminating newlines. But @kbd{C-k} | 811 | @var{n} lines, including their terminating newlines. But @kbd{C-k} |
| @@ -822,6 +827,9 @@ such arguments before the command, and to distinguish them from | |||
| 822 | minibuffer arguments (@pxref{Minibuffer}), which are entered after | 827 | minibuffer arguments (@pxref{Minibuffer}), which are entered after |
| 823 | invoking the command. | 828 | invoking the command. |
| 824 | 829 | ||
| 830 | On graphical displays, @kbd{C-0}, @kbd{C-1}, etc.@ act the same as | ||
| 831 | @kbd{M-0}, @kbd{M-1}, etc. | ||
| 832 | |||
| 825 | @node Repeating | 833 | @node Repeating |
| 826 | @section Repeating a Command | 834 | @section Repeating a Command |
| 827 | @cindex repeating a command | 835 | @cindex repeating a command |
| @@ -842,7 +850,7 @@ that were used before; it does not read new arguments each time. | |||
| 842 | 850 | ||
| 843 | To repeat the command more than once, type additional @kbd{z}'s: each | 851 | To repeat the command more than once, type additional @kbd{z}'s: each |
| 844 | @kbd{z} repeats the command one more time. Repetition ends when you | 852 | @kbd{z} repeats the command one more time. Repetition ends when you |
| 845 | type a character other than @kbd{z}, or press a mouse button. | 853 | type a character other than @kbd{z} or press a mouse button. |
| 846 | 854 | ||
| 847 | For example, suppose you type @kbd{C-u 2 0 C-d} to delete 20 | 855 | For example, suppose you type @kbd{C-u 2 0 C-d} to delete 20 |
| 848 | characters. You can repeat that command (including its argument) three | 856 | characters. You can repeat that command (including its argument) three |
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index f1fc24da6f2..3b645d5e65c 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi | |||
| @@ -209,14 +209,13 @@ through errors in the opposite direction. | |||
| 209 | act on the errors or matches listed in @file{*compilation*} and | 209 | act on the errors or matches listed in @file{*compilation*} and |
| 210 | @file{*grep*} buffers; they also know how to iterate through error or | 210 | @file{*grep*} buffers; they also know how to iterate through error or |
| 211 | match lists produced by other commands, such as @kbd{M-x occur} | 211 | match lists produced by other commands, such as @kbd{M-x occur} |
| 212 | (@pxref{Other Repeating Search}). If you are already in a buffer | 212 | (@pxref{Other Repeating Search}). If the current buffer contains |
| 213 | containing error messages or matches, those are the ones that are | 213 | error messages or matches, these commands will iterate through them; |
| 214 | iterated through; otherwise, Emacs looks for a buffer containing error | 214 | otherwise, Emacs looks for a buffer containing error messages or |
| 215 | messages or matches amongst the windows of the selected frame, then | 215 | matches amongst the windows of the selected frame, then for any buffer |
| 216 | for one that @code{next-error} or @code{previous-error} previously | 216 | that @code{next-error} or @code{previous-error} previously visited, |
| 217 | iterated through, and finally amongst all other buffers. If the | 217 | and finally all other buffers. Any buffer these commands iterate |
| 218 | buffer chosen for iterating through is not currently displayed in a | 218 | through that is not currently displayed in a window will be displayed. |
| 219 | window, it will be displayed. | ||
| 220 | 219 | ||
| 221 | @vindex compilation-skip-threshold | 220 | @vindex compilation-skip-threshold |
| 222 | By default, the @code{next-error} and @code{previous-error} commands | 221 | By default, the @code{next-error} and @code{previous-error} commands |
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index e3241452c88..805f580086d 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi | |||
| @@ -76,7 +76,7 @@ C-x d ~/foo/*/*.el @key{RET} | |||
| 76 | 76 | ||
| 77 | The former lists all the files with extension @samp{.el} in directory | 77 | The former lists all the files with extension @samp{.el} in directory |
| 78 | @samp{foo}. The latter lists the files with extension @samp{.el} | 78 | @samp{foo}. The latter lists the files with extension @samp{.el} |
| 79 | in subdirectories 2 levels of depth below @samp{foo}. | 79 | in all the subdirectories of @samp{foo}. |
| 80 | 80 | ||
| 81 | The usual history and completion commands can be used in the minibuffer; | 81 | The usual history and completion commands can be used in the minibuffer; |
| 82 | in particular, @kbd{M-n} puts the name of the visited file (if any) in | 82 | in particular, @kbd{M-n} puts the name of the visited file (if any) in |
| @@ -241,7 +241,7 @@ Even if you have set @code{dired-recursive-deletes} to @code{nil}, | |||
| 241 | you might want sometimes to delete recursively directories | 241 | you might want sometimes to delete recursively directories |
| 242 | without being asked for confirmation for all of them. This is handy | 242 | without being asked for confirmation for all of them. This is handy |
| 243 | when you have marked many directories for deletion and you are very | 243 | when you have marked many directories for deletion and you are very |
| 244 | sure that all of them can safely being deleted. For every nonempty | 244 | sure that all of them can safely be deleted. For every nonempty |
| 245 | directory you are asked for confirmation; if you answer @code{all}, | 245 | directory you are asked for confirmation; if you answer @code{all}, |
| 246 | then all the remaining directories will be deleted without more | 246 | then all the remaining directories will be deleted without more |
| 247 | questions. | 247 | questions. |
| @@ -488,10 +488,11 @@ Remove all marks from all the files in this Dired buffer | |||
| 488 | @kindex M-DEL @r{(Dired)} | 488 | @kindex M-DEL @r{(Dired)} |
| 489 | @findex dired-unmark-all-files | 489 | @findex dired-unmark-all-files |
| 490 | Remove all marks that use the character @var{markchar} | 490 | Remove all marks that use the character @var{markchar} |
| 491 | (@code{dired-unmark-all-files}). The argument is a single | 491 | (@code{dired-unmark-all-files}). If invoked with @kbd{M-@key{DEL}}, |
| 492 | character---do not use @key{RET} to terminate it. See the description | 492 | the command prompts for @var{markchar}. That @var{markchar} is a |
| 493 | of the @kbd{* c} command below, which lets you replace one mark | 493 | single character---do not use @key{RET} to terminate it. See the |
| 494 | character with another. | 494 | description of the @kbd{* c} command below, which lets you replace one |
| 495 | mark character with another. | ||
| 495 | 496 | ||
| 496 | With a numeric argument, this command queries about each marked file, | 497 | With a numeric argument, this command queries about each marked file, |
| 497 | asking whether to remove its mark. You can answer @kbd{y} meaning yes, | 498 | asking whether to remove its mark. You can answer @kbd{y} meaning yes, |
| @@ -503,7 +504,7 @@ files without asking about them. | |||
| 503 | @findex dired-next-marked-file | 504 | @findex dired-next-marked-file |
| 504 | @kindex * C-n @r{(Dired)} | 505 | @kindex * C-n @r{(Dired)} |
| 505 | @kindex M-@} @r{(Dired)} | 506 | @kindex M-@} @r{(Dired)} |
| 506 | Move down to the next marked file (@code{dired-next-marked-file}) | 507 | Move down to the next marked file (@code{dired-next-marked-file}). |
| 507 | A file is ``marked'' if it has any kind of mark. | 508 | A file is ``marked'' if it has any kind of mark. |
| 508 | 509 | ||
| 509 | @item * C-p | 510 | @item * C-p |
| @@ -511,7 +512,7 @@ A file is ``marked'' if it has any kind of mark. | |||
| 511 | @findex dired-prev-marked-file | 512 | @findex dired-prev-marked-file |
| 512 | @kindex * C-p @r{(Dired)} | 513 | @kindex * C-p @r{(Dired)} |
| 513 | @kindex M-@{ @r{(Dired)} | 514 | @kindex M-@{ @r{(Dired)} |
| 514 | Move up to the previous marked file (@code{dired-prev-marked-file}) | 515 | Move up to the previous marked file (@code{dired-prev-marked-file}). |
| 515 | 516 | ||
| 516 | @item t | 517 | @item t |
| 517 | @itemx * t | 518 | @itemx * t |
| @@ -574,9 +575,9 @@ the regular expression @var{regexp} | |||
| 574 | name. Note that if a file is visited in an Emacs buffer, | 575 | name. Note that if a file is visited in an Emacs buffer, |
| 575 | and @code{dired-always-read-filesystem} is @code{nil} (the default), this | 576 | and @code{dired-always-read-filesystem} is @code{nil} (the default), this |
| 576 | command will look in the buffer without revisiting the file, so the results | 577 | command will look in the buffer without revisiting the file, so the results |
| 577 | might be inconsistent with the file on disk if its contents has changed | 578 | might be inconsistent with the file on disk if its contents have changed |
| 578 | since it was last visited. If you don't want this, you may wish | 579 | since it was last visited. If you don't want this, you may wish to |
| 579 | reverting the files you have visited in your buffers, or turning on | 580 | revert the files you have visited in your buffers, or to turn on |
| 580 | the @code{auto-revert} mode in those buffers, before invoking this | 581 | the @code{auto-revert} mode in those buffers, before invoking this |
| 581 | command. @xref{Reverting}. If you prefer that this command always revisit | 582 | command. @xref{Reverting}. If you prefer that this command always revisit |
| 582 | the file, without having to revert the file or enable @code{auto-revert} | 583 | the file, without having to revert the file or enable @code{auto-revert} |
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index b2a4011b4a7..e22d7f30afb 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -108,9 +108,9 @@ point unchanged, so that the text and point move up or down together. | |||
| 108 | By default, these commands signal an error (by beeping or flashing | 108 | By default, these commands signal an error (by beeping or flashing |
| 109 | the screen) if no more scrolling is possible, because the window has | 109 | the screen) if no more scrolling is possible, because the window has |
| 110 | reached the beginning or end of the buffer. If you change the | 110 | reached the beginning or end of the buffer. If you change the |
| 111 | variable @code{scroll-error-top-bottom} to @code{t}, the command moves | 111 | variable @code{scroll-error-top-bottom} to @code{t}, these commands |
| 112 | point to the farthest possible position. If point is already there, | 112 | move point to the farthest possible position. If point is already |
| 113 | the command signals an error. | 113 | there, the commands signal an error. |
| 114 | 114 | ||
| 115 | @vindex scroll-preserve-screen-position | 115 | @vindex scroll-preserve-screen-position |
| 116 | @cindex @code{scroll-command} property | 116 | @cindex @code{scroll-command} property |
| @@ -270,7 +270,7 @@ parts of the window height from the bottom window edge. Thus, larger | |||
| 270 | view. The default value, @code{nil}, is equivalent to 0.5. | 270 | view. The default value, @code{nil}, is equivalent to 0.5. |
| 271 | 271 | ||
| 272 | Likewise, @code{scroll-down-aggressively} is used when point goes | 272 | Likewise, @code{scroll-down-aggressively} is used when point goes |
| 273 | above the bottom window edge (i.e., scrolling backward). The value | 273 | above the top window edge (i.e., scrolling backward). The value |
| 274 | specifies how far point should be from the top margin of the window | 274 | specifies how far point should be from the top margin of the window |
| 275 | after scrolling. Thus, as with @code{scroll-up-aggressively}, a | 275 | after scrolling. Thus, as with @code{scroll-up-aggressively}, a |
| 276 | larger value is more aggressive. | 276 | larger value is more aggressive. |
| @@ -330,8 +330,8 @@ scrolling away from that edge. | |||
| 330 | scroll the window when point gets too close to the edge. Zero, the | 330 | scroll the window when point gets too close to the edge. Zero, the |
| 331 | default value, means to center point horizontally within the window. | 331 | default value, means to center point horizontally within the window. |
| 332 | A positive integer value specifies the number of columns to scroll by. | 332 | A positive integer value specifies the number of columns to scroll by. |
| 333 | A floating-point number specifies the fraction of the window's width | 333 | A floating-point number (whose value should be between 0 and 1) |
| 334 | to scroll by. | 334 | specifies the fraction of the window's width to scroll by. |
| 335 | 335 | ||
| 336 | You can also perform explicit horizontal scrolling with the | 336 | You can also perform explicit horizontal scrolling with the |
| 337 | following commands: | 337 | following commands: |
| @@ -1768,6 +1768,11 @@ variant, @code{global-display-line-numbers-mode}. The user option | |||
| 1768 | @code{display-line-numbers-type} controls which sub-mode of | 1768 | @code{display-line-numbers-type} controls which sub-mode of |
| 1769 | line-number display, described above, will these modes activate. | 1769 | line-number display, described above, will these modes activate. |
| 1770 | 1770 | ||
| 1771 | @noindent | ||
| 1772 | Note that line numbers are not displayed in the minibuffer and in the | ||
| 1773 | tooltips, even if you turn on @code{display-line-numbers-mode} | ||
| 1774 | globally. | ||
| 1775 | |||
| 1771 | @vindex display-line-numbers-current-absolute | 1776 | @vindex display-line-numbers-current-absolute |
| 1772 | When Emacs displays relative line numbers, you can control the number | 1777 | When Emacs displays relative line numbers, you can control the number |
| 1773 | displayed before the current line, the line showing point. By | 1778 | displayed before the current line, the line showing point. By |
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 6efcc9d35de..3416db53f4e 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi | |||
| @@ -170,7 +170,7 @@ up to the end of the line; if point was originally at the beginning of | |||
| 170 | the line, this leaves the line blank. | 170 | the line, this leaves the line blank. |
| 171 | 171 | ||
| 172 | Spaces and tabs at the end of the line are ignored when deciding | 172 | Spaces and tabs at the end of the line are ignored when deciding |
| 173 | which case applies. As long as point is after the last visible | 173 | which case applies. As long as point is after the last non-whitespace |
| 174 | character in the line, you can be sure that @kbd{C-k} will kill the | 174 | character in the line, you can be sure that @kbd{C-k} will kill the |
| 175 | newline. To kill an entire non-blank line, go to the beginning and | 175 | newline. To kill an entire non-blank line, go to the beginning and |
| 176 | type @kbd{C-k} twice. | 176 | type @kbd{C-k} twice. |
diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index c9cef750fb4..8528c9f6bd5 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi | |||
| @@ -454,7 +454,7 @@ M-x insert-kbd-macro @key{RET} @var{macroname} @key{RET} | |||
| 454 | 454 | ||
| 455 | @noindent | 455 | @noindent |
| 456 | This inserts some Lisp code that, when executed later, will define the | 456 | This inserts some Lisp code that, when executed later, will define the |
| 457 | same macro with the same definition it has now. (You need not | 457 | same macro with the same definition it has now. (You don't need to |
| 458 | understand Lisp code to do this, because @code{insert-kbd-macro} writes | 458 | understand Lisp code to do this, because @code{insert-kbd-macro} writes |
| 459 | the Lisp code for you.) Then save the file. You can load the file | 459 | the Lisp code for you.) Then save the file. You can load the file |
| 460 | later with @code{load-file} (@pxref{Lisp Libraries}). If the file you | 460 | later with @code{load-file} (@pxref{Lisp Libraries}). If the file you |
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 1438682d191..fcd229d817c 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi | |||
| @@ -57,9 +57,9 @@ the minibuffer (since typing @key{RET} would no longer submit that | |||
| 57 | default). If you ever bring back the original minibuffer text, the | 57 | default). If you ever bring back the original minibuffer text, the |
| 58 | prompt again shows the default. Furthermore, if you change the | 58 | prompt again shows the default. Furthermore, if you change the |
| 59 | variable @code{minibuffer-eldef-shorten-default} to a non-@code{nil} | 59 | variable @code{minibuffer-eldef-shorten-default} to a non-@code{nil} |
| 60 | value, the default argument is displayed as @samp{[@var{default}]} | 60 | value, the default argument is displayed as @samp{[@var{default-arg}]} |
| 61 | instead of @samp{(default @var{default})}, saving some screen space. | 61 | instead of @samp{(default @var{default-arg})}, saving some screen |
| 62 | To enable this minor mode, type @kbd{M-x | 62 | space. To enable this minor mode, type @kbd{M-x |
| 63 | minibuffer-electric-default-mode}. | 63 | minibuffer-electric-default-mode}. |
| 64 | 64 | ||
| 65 | Since the minibuffer appears in the echo area, it can conflict with | 65 | Since the minibuffer appears in the echo area, it can conflict with |
| @@ -224,7 +224,7 @@ set the variable @code{enable-recursive-minibuffers} to @code{t}. | |||
| 224 | When not active, the minibuffer is in @code{minibuffer-inactive-mode}, | 224 | When not active, the minibuffer is in @code{minibuffer-inactive-mode}, |
| 225 | and clicking @kbd{mouse-1} there shows the @file{*Messages*} buffer. | 225 | and clicking @kbd{mouse-1} there shows the @file{*Messages*} buffer. |
| 226 | If you use a dedicated frame for minibuffers, Emacs also recognizes | 226 | If you use a dedicated frame for minibuffers, Emacs also recognizes |
| 227 | certain keys there, for example @kbd{n} to make a new frame. | 227 | certain keys there, for example, @kbd{n} to make a new frame. |
| 228 | 228 | ||
| 229 | @node Completion | 229 | @node Completion |
| 230 | @section Completion | 230 | @section Completion |
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 96500690de2..dd9e4d7cc7c 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | Emacs @dfn{registers} are compartments where you can save text, | 9 | Emacs @dfn{registers} are compartments where you can save text, |
| 10 | rectangles, positions, and other things for later use. Once you save | 10 | rectangles, positions, and other things for later use. Once you save |
| 11 | text or a rectangle in a register, you can copy it into the buffer | 11 | text or a rectangle in a register, you can copy it into the buffer |
| 12 | once, or many times; once you save a position in a register, you can | 12 | once or many times; once you save a position in a register, you can |
| 13 | jump back to that position once, or many times. | 13 | jump back to that position once or many times. |
| 14 | 14 | ||
| 15 | Each register has a name that consists of a single character, which | 15 | Each register has a name that consists of a single character, which |
| 16 | we will denote by @var{r}; @var{r} can be a letter (such as @samp{a}) | 16 | we will denote by @var{r}; @var{r} can be a letter (such as @samp{a}) |
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 3c3ee659dcb..945b7cb941e 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi | |||
| @@ -174,9 +174,9 @@ After the rightmost and bottommost window, it goes back to the one at | |||
| 174 | the upper left corner. A numeric argument means to move several steps | 174 | the upper left corner. A numeric argument means to move several steps |
| 175 | in the cyclic order of windows. A negative argument moves around the | 175 | in the cyclic order of windows. A negative argument moves around the |
| 176 | cycle in the opposite order. When the minibuffer is active, the | 176 | cycle in the opposite order. When the minibuffer is active, the |
| 177 | minibuffer is the last window in the cycle; you can switch from the | 177 | minibuffer window is the last window in the cycle; you can switch from |
| 178 | minibuffer window to one of the other windows, and later switch back and | 178 | the minibuffer window to one of the other windows, and later switch |
| 179 | finish supplying the minibuffer argument that is requested. | 179 | back and finish supplying the minibuffer argument that is requested. |
| 180 | @xref{Minibuffer Edit}. | 180 | @xref{Minibuffer Edit}. |
| 181 | 181 | ||
| 182 | @kindex C-M-v | 182 | @kindex C-M-v |