diff options
| author | Chong Yidong | 2013-12-18 10:43:47 +0800 |
|---|---|---|
| committer | Chong Yidong | 2013-12-18 10:43:47 +0800 |
| commit | 33f5d4c15aa65576ff7f2ee62553280f9f92343c (patch) | |
| tree | 6a37eafafaf78ed70a7e7522873ece99fa683d62 /lisp | |
| parent | 9cdb8d8556bac927d1391a859e0737d50e07d7f5 (diff) | |
| download | emacs-33f5d4c15aa65576ff7f2ee62553280f9f92343c.tar.gz emacs-33f5d4c15aa65576ff7f2ee62553280f9f92343c.zip | |
* simple.el (append-next-kill): Doc fix (Bug#15995, Bug#16016).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43185a2acb2..3a86fff5e50 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-12-18 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (append-next-kill): Doc fix (Bug#15995, Bug#16016). | ||
| 4 | |||
| 1 | 2013-12-18 Glenn Morris <rgm@gnu.org> | 5 | 2013-12-18 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * mail/emacsbug.el (report-emacs-bug): | 7 | * mail/emacsbug.el (report-emacs-bug): |
diff --git a/lisp/simple.el b/lisp/simple.el index 412d75f9221..61068efce59 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3764,7 +3764,17 @@ of this sample text; it defaults to 40." | |||
| 3764 | (buffer-substring-no-properties mark (+ mark len)))))))) | 3764 | (buffer-substring-no-properties mark (+ mark len)))))))) |
| 3765 | 3765 | ||
| 3766 | (defun append-next-kill (&optional interactive) | 3766 | (defun append-next-kill (&optional interactive) |
| 3767 | "Cause following command, if it kills, to append to previous kill. | 3767 | "Cause following command, if it kills, to add to previous kill. |
| 3768 | If the next command kills forward from point, the kill is | ||
| 3769 | appended to the previous killed text. If the command kills | ||
| 3770 | backward, the kill is prepended. Kill commands that act on the | ||
| 3771 | region, such as `kill-region', are regarded as killing forward if | ||
| 3772 | point is after mark, and killing backward if point is before | ||
| 3773 | mark. | ||
| 3774 | |||
| 3775 | If the next command is not a kill command, `append-next-kill' has | ||
| 3776 | no effect. | ||
| 3777 | |||
| 3768 | The argument is used for internal purposes; do not supply one." | 3778 | The argument is used for internal purposes; do not supply one." |
| 3769 | (interactive "p") | 3779 | (interactive "p") |
| 3770 | ;; We don't use (interactive-p), since that breaks kbd macros. | 3780 | ;; We don't use (interactive-p), since that breaks kbd macros. |