diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/buffers.texi | 76 | ||||
| -rw-r--r-- | doc/emacs/mark.texi | 11 | ||||
| -rw-r--r-- | doc/emacs/text.texi | 9 | ||||
| -rw-r--r-- | doc/emacs/trouble.texi | 5 | ||||
| -rw-r--r-- | doc/misc/org.texi | 4 |
5 files changed, 57 insertions, 48 deletions
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 47ac8d4b05c..f8c1856058a 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi | |||
| @@ -81,7 +81,7 @@ Select the next buffer in the buffer list (@code{next-buffer}). | |||
| 81 | @item C-u M-g M-g | 81 | @item C-u M-g M-g |
| 82 | @itemx C-u M-g g | 82 | @itemx C-u M-g g |
| 83 | Read a number @var{n} and move to line @var{n} in the most recently | 83 | Read a number @var{n} and move to line @var{n} in the most recently |
| 84 | selected buffer other than the current buffer. | 84 | selected buffer other than the current buffer, in another window. |
| 85 | @end table | 85 | @end table |
| 86 | 86 | ||
| 87 | @kindex C-x b | 87 | @kindex C-x b |
| @@ -94,12 +94,12 @@ now displayed in any window. | |||
| 94 | 94 | ||
| 95 | While entering the buffer name, you can use the usual completion and | 95 | While entering the buffer name, you can use the usual completion and |
| 96 | history commands (@pxref{Minibuffer}). Note that @kbd{C-x b}, and | 96 | history commands (@pxref{Minibuffer}). Note that @kbd{C-x b}, and |
| 97 | related commands, use @dfn{permissive completion with confirmation} for | 97 | related commands, use @dfn{permissive completion with confirmation} |
| 98 | minibuffer completion: if you type @key{RET} immediately after | 98 | for minibuffer completion: if you type @key{RET} when the minibuffer |
| 99 | completing up to a nonexistent buffer name, Emacs prints | 99 | text names a nonexistent buffer, Emacs prints @samp{[Confirm]} and you |
| 100 | @samp{[Confirm]} and you must type a second @key{RET} to submit that | 100 | must type a second @key{RET} to submit that buffer name. |
| 101 | buffer name. @xref{Completion Exit}, for details. For other | 101 | @xref{Completion Exit}, for details. For other completion options and |
| 102 | completion options and features, see @ref{Completion Options}. | 102 | features, see @ref{Completion Options}. |
| 103 | 103 | ||
| 104 | If you specify a buffer that does not exist, @kbd{C-x b} creates a | 104 | If you specify a buffer that does not exist, @kbd{C-x b} creates a |
| 105 | new, empty buffer that is not visiting any file, and selects it for | 105 | new, empty buffer that is not visiting any file, and selects it for |
| @@ -124,18 +124,19 @@ direction. | |||
| 124 | 124 | ||
| 125 | @kindex C-x 4 b | 125 | @kindex C-x 4 b |
| 126 | @findex switch-to-buffer-other-window | 126 | @findex switch-to-buffer-other-window |
| 127 | To select a buffer in a window other than the current one, type | 127 | To select a buffer in a window other than the current one |
| 128 | @kbd{C-x 4 b} (@code{switch-to-buffer-other-window}). This prompts | 128 | (@pxref{Windows}), type @kbd{C-x 4 b} |
| 129 | for a buffer name using the minibuffer, displays that buffer in | 129 | (@code{switch-to-buffer-other-window}). This prompts for a buffer |
| 130 | another window, and selects that window. | 130 | name using the minibuffer, displays that buffer in another window, and |
| 131 | selects that window. | ||
| 131 | 132 | ||
| 132 | @kindex C-x 5 b | 133 | @kindex C-x 5 b |
| 133 | @findex switch-to-buffer-other-frame | 134 | @findex switch-to-buffer-other-frame |
| 134 | Similarly, @kbd{C-x 5 b} (@code{switch-to-buffer-other-frame}) | 135 | Similarly, @kbd{C-x 5 b} (@code{switch-to-buffer-other-frame}) |
| 135 | prompts for a buffer name, displays that buffer in another frame, and | 136 | prompts for a buffer name, displays that buffer in another frame |
| 136 | selects that frame. If the buffer is already being shown in a window | 137 | (@pxref{Frames}), and selects that frame. If the buffer is already |
| 137 | on another frame, Emacs selects that window and frame instead of | 138 | being shown in a window on another frame, Emacs selects that window |
| 138 | creating a new frame. | 139 | and frame instead of creating a new frame. |
| 139 | 140 | ||
| 140 | @xref{Displaying Buffers}, for how the @kbd{C-x 4 b} and @kbd{C-x 5 | 141 | @xref{Displaying Buffers}, for how the @kbd{C-x 4 b} and @kbd{C-x 5 |
| 141 | b} commands get the window and/or frame to display in. | 142 | b} commands get the window and/or frame to display in. |
| @@ -219,7 +220,7 @@ unless they visit files: such buffers are used internally by Emacs. | |||
| 219 | @table @kbd | 220 | @table @kbd |
| 220 | @item C-x C-q | 221 | @item C-x C-q |
| 221 | Toggle read-only status of buffer (@code{read-only-mode}). | 222 | Toggle read-only status of buffer (@code{read-only-mode}). |
| 222 | @item M-x rename-buffer @key{RET} @var{name} @key{RET} | 223 | @item M-x rename-buffer @key{RET} @var{buffer} @key{RET} |
| 223 | Change the name of the current buffer. | 224 | Change the name of the current buffer. |
| 224 | @item M-x rename-uniquely | 225 | @item M-x rename-uniquely |
| 225 | Rename the current buffer by adding @samp{<@var{number}>} to the end. | 226 | Rename the current buffer by adding @samp{<@var{number}>} to the end. |
| @@ -234,8 +235,9 @@ Scroll through buffer @var{buffer}. @xref{View Mode}. | |||
| 234 | its contents are not allowed. The mode line indicates read-only | 235 | its contents are not allowed. The mode line indicates read-only |
| 235 | buffers with @samp{%%} or @samp{%*} near the left margin. @xref{Mode | 236 | buffers with @samp{%%} or @samp{%*} near the left margin. @xref{Mode |
| 236 | Line}. Read-only buffers are usually made by subsystems such as Dired | 237 | Line}. Read-only buffers are usually made by subsystems such as Dired |
| 237 | and Rmail that have special commands to operate on the text; also by | 238 | and Rmail that have special commands to operate on the text. Visiting |
| 238 | visiting a file whose access control says you cannot write it. | 239 | a file whose access control says you cannot write it also makes the |
| 240 | buffer read-only. | ||
| 239 | 241 | ||
| 240 | @findex read-only-mode | 242 | @findex read-only-mode |
| 241 | @vindex view-read-only | 243 | @vindex view-read-only |
| @@ -282,13 +284,13 @@ large number of buffers. You may then find it convenient to @dfn{kill} | |||
| 282 | the buffers you no longer need. (Some other editors call this | 284 | the buffers you no longer need. (Some other editors call this |
| 283 | operation @dfn{close}, and talk about ``closing the buffer'' or | 285 | operation @dfn{close}, and talk about ``closing the buffer'' or |
| 284 | ``closing the file'' visited in the buffer.) On most operating | 286 | ``closing the file'' visited in the buffer.) On most operating |
| 285 | systems, killing a buffer releases its space back to the operating | 287 | systems, killing a buffer releases the memory Emacs used for the buffer |
| 286 | system so that other programs can use it. Here are some commands for | 288 | back to the operating system so that other programs can use it. Here |
| 287 | killing buffers: | 289 | are some commands for killing buffers: |
| 288 | 290 | ||
| 289 | @table @kbd | 291 | @table @kbd |
| 290 | @item C-x k @var{bufname} @key{RET} | 292 | @item C-x k @var{buffer} @key{RET} |
| 291 | Kill buffer @var{bufname} (@code{kill-buffer}). | 293 | Kill buffer @var{buffer} (@code{kill-buffer}). |
| 292 | @item M-x kill-some-buffers | 294 | @item M-x kill-some-buffers |
| 293 | Offer to kill each buffer, one by one. | 295 | Offer to kill each buffer, one by one. |
| 294 | @item M-x kill-matching-buffers | 296 | @item M-x kill-matching-buffers |
| @@ -307,7 +309,7 @@ confirm with @kbd{yes} before the buffer is killed. | |||
| 307 | 309 | ||
| 308 | @findex kill-some-buffers | 310 | @findex kill-some-buffers |
| 309 | The command @kbd{M-x kill-some-buffers} asks about each buffer, one | 311 | The command @kbd{M-x kill-some-buffers} asks about each buffer, one |
| 310 | by one. An answer of @kbd{y} means to kill the buffer, just like | 312 | by one. An answer of @kbd{yes} means to kill the buffer, just like |
| 311 | @code{kill-buffer}. This command ignores buffers whose names begin | 313 | @code{kill-buffer}. This command ignores buffers whose names begin |
| 312 | with a space, which are used internally by Emacs. | 314 | with a space, which are used internally by Emacs. |
| 313 | 315 | ||
| @@ -335,7 +337,9 @@ all the unmodified buffers that you have not used for a long time. An | |||
| 335 | ordinary buffer is killed if it has not been displayed for three days; | 337 | ordinary buffer is killed if it has not been displayed for three days; |
| 336 | however, you can specify certain buffers that should never be killed | 338 | however, you can specify certain buffers that should never be killed |
| 337 | automatically, and others that should be killed if they have been unused | 339 | automatically, and others that should be killed if they have been unused |
| 338 | for a mere hour. | 340 | for a mere hour. These defaults, and other aspects of this command's |
| 341 | behavior, can be controlled by customizing several options described | ||
| 342 | in the doc string of @code{clean-buffer-list}. | ||
| 339 | 343 | ||
| 340 | @cindex Midnight mode | 344 | @cindex Midnight mode |
| 341 | @vindex midnight-mode | 345 | @vindex midnight-mode |
| @@ -410,7 +414,8 @@ Perform all flagged deletions and saves (@code{Buffer-menu-execute}). | |||
| 410 | @findex Buffer-menu-unmark | 414 | @findex Buffer-menu-unmark |
| 411 | @kindex u @r{(Buffer Menu)} | 415 | @kindex u @r{(Buffer Menu)} |
| 412 | Remove all flags from the current line, and move down | 416 | Remove all flags from the current line, and move down |
| 413 | (@code{Buffer-menu-unmark}). | 417 | (@code{Buffer-menu-unmark}). With a prefix argument, moves up after |
| 418 | removing the flags. | ||
| 414 | 419 | ||
| 415 | @item @key{DEL} | 420 | @item @key{DEL} |
| 416 | @findex Buffer-menu-backup-unmark | 421 | @findex Buffer-menu-backup-unmark |
| @@ -422,7 +427,9 @@ Move to the previous line and remove all flags on that line | |||
| 422 | @findex Buffer-menu-unmark-all-buffers | 427 | @findex Buffer-menu-unmark-all-buffers |
| 423 | @kindex M-DEL @r{(Buffer Menu)} | 428 | @kindex M-DEL @r{(Buffer Menu)} |
| 424 | Remove a particular flag from all lines | 429 | Remove a particular flag from all lines |
| 425 | (@code{Buffer-menu-unmark-all-buffers}). | 430 | (@code{Buffer-menu-unmark-all-buffers}). This asks for a single |
| 431 | character, and unmarks buffers marked with that character; typing | ||
| 432 | @key{RET} removes all marks. | ||
| 426 | 433 | ||
| 427 | @item U | 434 | @item U |
| 428 | @findex Buffer-menu-unmark-all | 435 | @findex Buffer-menu-unmark-all |
| @@ -432,8 +439,8 @@ Remove all flags from all the lines | |||
| 432 | @end table | 439 | @end table |
| 433 | 440 | ||
| 434 | @noindent | 441 | @noindent |
| 435 | The commands for adding or removing flags, @kbd{d}, @kbd{C-d}, @kbd{s} | 442 | The commands for removing flags, @kbd{d} and @kbd{C-d}, accept a |
| 436 | and @kbd{u}, all accept a numeric argument as a repeat count. | 443 | numeric argument as a repeat count. |
| 437 | 444 | ||
| 438 | The following commands operate immediately on the buffer listed on | 445 | The following commands operate immediately on the buffer listed on |
| 439 | the current line. They also accept a numeric argument as a repeat | 446 | the current line. They also accept a numeric argument as a repeat |
| @@ -505,7 +512,8 @@ selected in one, and a previously current buffer (aside from | |||
| 505 | @item b | 512 | @item b |
| 506 | @findex Buffer-menu-bury | 513 | @findex Buffer-menu-bury |
| 507 | @kindex b @r{(Buffer Menu)} | 514 | @kindex b @r{(Buffer Menu)} |
| 508 | Bury this line's buffer (@code{Buffer-menu-bury}). | 515 | Bury this line's buffer (@code{Buffer-menu-bury}) (i.e., move it to |
| 516 | the end of the buffer list). | ||
| 509 | 517 | ||
| 510 | @item m | 518 | @item m |
| 511 | @findex Buffer-menu-mark | 519 | @findex Buffer-menu-mark |
| @@ -727,10 +735,10 @@ C-b}. To customize this buffer list, use the @code{bs} Custom group | |||
| 727 | @kindex C-Down-mouse-1 | 735 | @kindex C-Down-mouse-1 |
| 728 | MSB global minor mode (``MSB'' stands for ``mouse select buffer'') | 736 | MSB global minor mode (``MSB'' stands for ``mouse select buffer'') |
| 729 | provides a different and customizable mouse buffer menu which you may | 737 | provides a different and customizable mouse buffer menu which you may |
| 730 | prefer. It replaces the bindings of @code{mouse-buffer-menu}, | 738 | prefer. It replaces the @code{mouse-buffer-menu} commands, normally |
| 731 | normally on @kbd{C-Down-mouse-1} and @kbd{C-@key{F10}}, and the menu | 739 | bound to @kbd{C-Down-mouse-1} and @kbd{C-@key{F10}}, with its own |
| 732 | bar buffer menu. You can customize the menu in the @code{msb} Custom | 740 | commands, and also modifies the menu-bar buffer menu. You can |
| 733 | group. | 741 | customize the menu in the @code{msb} Custom group. |
| 734 | 742 | ||
| 735 | @findex ibuffer | 743 | @findex ibuffer |
| 736 | IBuffer is a major mode for viewing a list of buffers and operating | 744 | IBuffer is a major mode for viewing a list of buffers and operating |
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index c1932b682de..072a3bc4b11 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi | |||
| @@ -135,10 +135,11 @@ detailed description of these mouse commands. | |||
| 135 | typing certain cursor motion commands (such as @kbd{S-@key{RIGHT}}, | 135 | typing certain cursor motion commands (such as @kbd{S-@key{RIGHT}}, |
| 136 | @kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}. | 136 | @kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}. |
| 137 | It sets the mark at point before moving point, but only if there is no | 137 | It sets the mark at point before moving point, but only if there is no |
| 138 | active mark set via shift-selection. The mark set by mouse commands | 138 | active mark set via a previous shift-selection or mouse commands. The |
| 139 | and by shift-selection behaves slightly differently from the usual | 139 | mark set by mouse commands and by shift-selection behaves slightly |
| 140 | mark: any subsequent unshifted cursor motion command deactivates it | 140 | differently from the usual mark: any subsequent unshifted cursor motion |
| 141 | automatically. For details, see @ref{Shift Selection}. | 141 | command deactivates it automatically. For details, see @ref{Shift |
| 142 | Selection}. | ||
| 142 | 143 | ||
| 143 | Many commands that insert text, such as @kbd{C-y} (@code{yank}), set | 144 | Many commands that insert text, such as @kbd{C-y} (@code{yank}), set |
| 144 | the mark at the other end of the inserted text, without activating it. | 145 | the mark at the other end of the inserted text, without activating it. |
| @@ -161,7 +162,7 @@ object such as a word, list, paragraph or page: | |||
| 161 | 162 | ||
| 162 | @table @kbd | 163 | @table @kbd |
| 163 | @item M-@@ | 164 | @item M-@@ |
| 164 | Set mark after end of next word (@code{mark-word}). This does not | 165 | Set mark at the end of the next word (@code{mark-word}). This does not |
| 165 | move point. | 166 | move point. |
| 166 | @item C-M-@@ | 167 | @item C-M-@@ |
| 167 | Set mark after end of following balanced expression | 168 | Set mark after end of following balanced expression |
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 846d9fe8c62..b7659976a98 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi | |||
| @@ -381,12 +381,13 @@ at the end). | |||
| 381 | @kbd{C-x C-p C-w} is a handy way to kill a page to move it | 381 | @kbd{C-x C-p C-w} is a handy way to kill a page to move it |
| 382 | elsewhere. If you move to another page delimiter with @kbd{C-x [} and | 382 | elsewhere. If you move to another page delimiter with @kbd{C-x [} and |
| 383 | @kbd{C-x ]}, then yank the killed page, all the pages will be properly | 383 | @kbd{C-x ]}, then yank the killed page, all the pages will be properly |
| 384 | delimited once again. The reason @kbd{C-x C-p} includes only the | 384 | delimited once again. Making sure this works as expected is the |
| 385 | following page delimiter in the region is to ensure that. | 385 | reason @kbd{C-x C-p} includes only the following page delimiter in the |
| 386 | region. | ||
| 386 | 387 | ||
| 387 | A numeric argument to @kbd{C-x C-p} specifies which page to go to, | 388 | A numeric argument to @kbd{C-x C-p} specifies which page to go to, |
| 388 | relative to the current one. Zero means the current page, one | 389 | relative to the current one. Zero means the current page, one means |
| 389 | the next page, and @minus{}1 the previous one. | 390 | the next page, and @minus{}1 means the previous one. |
| 390 | 391 | ||
| 391 | @kindex C-x l | 392 | @kindex C-x l |
| 392 | @findex count-lines-page | 393 | @findex count-lines-page |
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index dd9d088a56e..05114c376c9 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi | |||
| @@ -452,7 +452,7 @@ displays, you can use the mouse to kill Emacs or switch to another | |||
| 452 | program. | 452 | program. |
| 453 | 453 | ||
| 454 | On MS-DOS, you must type @kbd{C-@key{Break}} (twice) to cause | 454 | On MS-DOS, you must type @kbd{C-@key{Break}} (twice) to cause |
| 455 | emergency escape---but there are cases where it won't work, when | 455 | emergency escape---but there are cases where it won't work, when a |
| 456 | system call hangs or when Emacs is stuck in a tight loop in C code. | 456 | system call hangs or when Emacs is stuck in a tight loop in C code. |
| 457 | 457 | ||
| 458 | @node Bugs | 458 | @node Bugs |
| @@ -1225,8 +1225,7 @@ check if existing bug reports are fixed in newer versions of Emacs | |||
| 1225 | @url{https://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}. | 1225 | @url{https://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}. |
| 1226 | 1226 | ||
| 1227 | @item | 1227 | @item |
| 1228 | fix existing bug reports | 1228 | fix existing bug reports. |
| 1229 | @url{https://debbugs.gnu.org/cgi/pkgreport.cgi?which=pkg&data=emacs}. | ||
| 1230 | 1229 | ||
| 1231 | @item | 1230 | @item |
| 1232 | @c etc/TODO not in WWW_GNU_ORG | 1231 | @c etc/TODO not in WWW_GNU_ORG |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index f779417bd70..762dfafdda7 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | @settitle The Org Manual | 4 | @settitle The Org Manual |
| 5 | @include docstyle.texi | 5 | @include docstyle.texi |
| 6 | 6 | ||
| 7 | @set VERSION 9.1.4 | 7 | @set VERSION 9.1.6 |
| 8 | @set DATE 2017-09-17 | 8 | @set DATE 2018-01-03 |
| 9 | 9 | ||
| 10 | @c Version and Contact Info | 10 | @c Version and Contact Info |
| 11 | @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page} | 11 | @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page} |