diff options
| author | Eli Zaretskii | 2015-12-05 11:12:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-12-05 11:12:38 +0200 |
| commit | b3b68eb655595407f8b03e5500df081324e0cd40 (patch) | |
| tree | f56d6c1fa477dacaed16821fd075f1edd591529f /doc | |
| parent | f18e93442b283b4eabfc063a06892fa4cc8579e8 (diff) | |
| download | emacs-b3b68eb655595407f8b03e5500df081324e0cd40.tar.gz emacs-b3b68eb655595407f8b03e5500df081324e0cd40.zip | |
Fix documentation of 'undo' changes
* doc/lispref/text.texi (Undo): Minor wording changes. Use US
English conventions for spelling and whitespace between sentences.
* etc/NEWS: Fix wording and spelling of undo-related entries.
Mark them as documented.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/text.texi | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 1bb5303620d..dfd85bf124e 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -1353,26 +1353,27 @@ appropriate time. | |||
| 1353 | @end defun | 1353 | @end defun |
| 1354 | 1354 | ||
| 1355 | @defun undo-auto-amalgamate | 1355 | @defun undo-auto-amalgamate |
| 1356 | @cindex amalgamating commands, and undo | ||
| 1356 | The editor command loop automatically calls @code{undo-boundary} just | 1357 | The editor command loop automatically calls @code{undo-boundary} just |
| 1357 | before executing each key sequence, so that each undo normally undoes | 1358 | before executing each key sequence, so that each undo normally undoes |
| 1358 | the effects of one command. A few exceptional commands are | 1359 | the effects of one command. A few exceptional commands are |
| 1359 | @emph{amalgamating}: these commands generally cause small changes to | 1360 | @dfn{amalgamating}: these commands generally cause small changes to |
| 1360 | buffers. So with these a boundary is inserted only every 20th command, | 1361 | buffers, so with these a boundary is inserted only every 20th command, |
| 1361 | so that these can be undone as a group. By default commands | 1362 | allowing to undo them as a group. By default, commands |
| 1362 | @code{self-insert-command}, which produces self-inserting input | 1363 | @code{self-insert-command}, which produces self-inserting input |
| 1363 | characters (@pxref{Commands for Insertion}), and @code{delete-char} | 1364 | characters (@pxref{Commands for Insertion}), and @code{delete-char} |
| 1364 | which deletes characters (@pxref{Deletion}) are amalgamating. | 1365 | which deletes characters (@pxref{Deletion}) are amalgamating. |
| 1365 | Where a command affects the contents of several buffers as may happen, | 1366 | Where a command affects the contents of several buffers, as may happen, |
| 1366 | for example, if a function on the @code{post-command-hook} affects a | 1367 | for example, when a function on the @code{post-command-hook} affects a |
| 1367 | buffer other than the @code{current-buffer}, then @code{undo-boundary} | 1368 | buffer other than the @code{current-buffer}, then @code{undo-boundary} |
| 1368 | will be called in each of them. | 1369 | will be called in each of the affected buffers. |
| 1369 | @end defun | 1370 | @end defun |
| 1370 | 1371 | ||
| 1371 | @defvar undo-auto-current-boundary-timer | 1372 | @defvar undo-auto-current-boundary-timer |
| 1372 | Some buffers, such as process buffers, can change even when no | 1373 | Some buffers, such as process buffers, can change even when no |
| 1373 | commands are executing. In these cases, @code{undo-boundary} is | 1374 | commands are executing. In these cases, @code{undo-boundary} is |
| 1374 | normally called periodically by the timer in this variable. Setting | 1375 | normally called periodically by the timer in this variable. Setting |
| 1375 | this variable to non-@code{nil} prevents this behaviour. | 1376 | this variable to non-@code{nil} prevents this behavior. |
| 1376 | @end defvar | 1377 | @end defvar |
| 1377 | 1378 | ||
| 1378 | @defvar undo-in-progress | 1379 | @defvar undo-in-progress |