diff options
| author | Glenn Morris | 2016-01-25 18:24:09 -0500 |
|---|---|---|
| committer | Glenn Morris | 2016-01-25 18:24:09 -0500 |
| commit | 9dec01d2912f84373c16fa8cc9da8992f37e6de6 (patch) | |
| tree | c7f8ce46074d216ea690e23c540b6c4b714d8090 /lisp | |
| parent | 60f6bd85a61ab0e46a51ed6adc7e13f05d43338a (diff) | |
| download | emacs-9dec01d2912f84373c16fa8cc9da8992f37e6de6.tar.gz emacs-9dec01d2912f84373c16fa8cc9da8992f37e6de6.zip | |
; Spelling fixes (American spelling)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog.17 | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index ee812bde82d..1785a336732 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 | |||
| @@ -4437,7 +4437,7 @@ | |||
| 4437 | 4437 | ||
| 4438 | 2014-12-07 Lars Magne Ingebrigtsen <larsi@gnus.org> | 4438 | 2014-12-07 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 4439 | 4439 | ||
| 4440 | * net/eww.el (eww-follow-link): Revert prefix behaviour to | 4440 | * net/eww.el (eww-follow-link): Revert prefix behavior to |
| 4441 | previous behavior. | 4441 | previous behavior. |
| 4442 | (eww-copy-page-url): Add doc string. | 4442 | (eww-copy-page-url): Add doc string. |
| 4443 | 4443 | ||
| @@ -9140,7 +9140,7 @@ | |||
| 9140 | 2014-06-30 Grégoire Jadi <daimrod@gmail.com> | 9140 | 2014-06-30 Grégoire Jadi <daimrod@gmail.com> |
| 9141 | 9141 | ||
| 9142 | * net/rcirc.el (rcirc-buffer-process): Restore previous | 9142 | * net/rcirc.el (rcirc-buffer-process): Restore previous |
| 9143 | behaviour. (Bug#17772) | 9143 | behavior. (Bug#17772) |
| 9144 | 9144 | ||
| 9145 | 2014-06-29 Alan Mackenzie <acm@muc.de> | 9145 | 2014-06-29 Alan Mackenzie <acm@muc.de> |
| 9146 | 9146 | ||
diff --git a/lisp/simple.el b/lisp/simple.el index ed4ca91b2e5..72e87a410fc 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -2894,7 +2894,7 @@ removes the previous `undo-boundary' if a series of such calls | |||
| 2894 | have been made. By default `self-insert-command' and | 2894 | have been made. By default `self-insert-command' and |
| 2895 | `delete-char' are the only amalgamating commands, although this | 2895 | `delete-char' are the only amalgamating commands, although this |
| 2896 | function could be called by any command wishing to have this | 2896 | function could be called by any command wishing to have this |
| 2897 | behaviour." | 2897 | behavior." |
| 2898 | (let ((last-amalgamating-count | 2898 | (let ((last-amalgamating-count |
| 2899 | (undo-auto--last-boundary-amalgamating-number))) | 2899 | (undo-auto--last-boundary-amalgamating-number))) |
| 2900 | (setq undo-auto--this-command-amalgamating t) | 2900 | (setq undo-auto--this-command-amalgamating t) |