diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f45a4051bb3..8a93bde3575 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2004-02-11 Luc Teirlinck <teirllm@auburn.edu> | 1 | 2004-02-11 Luc Teirlinck <teirllm@auburn.edu> |
| 2 | 2 | ||
| 3 | * simple.el (kill-append): Doc fix. | ||
| 4 | |||
| 3 | * emacs-lisp/lisp-mode.el (lisp-mode-variables): Adapt | 5 | * emacs-lisp/lisp-mode.el (lisp-mode-variables): Adapt |
| 4 | outline-regexp to the new conventions for commenting out code. | 6 | outline-regexp to the new conventions for commenting out code. |
| 5 | 7 | ||
diff --git a/lisp/simple.el b/lisp/simple.el index d978ecd6555..4fa209f161e 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -1834,7 +1834,7 @@ the front of the kill ring, rather than being added to the list. | |||
| 1834 | Optional third arguments YANK-HANDLER controls how the STRING is later | 1834 | Optional third arguments YANK-HANDLER controls how the STRING is later |
| 1835 | inserted into a buffer; see `insert-for-yank' for details. | 1835 | inserted into a buffer; see `insert-for-yank' for details. |
| 1836 | When a yank handler is specified, STRING must be non-empty (the yank | 1836 | When a yank handler is specified, STRING must be non-empty (the yank |
| 1837 | handler is stored as a `yank-handler'text property on STRING). | 1837 | handler is stored as a `yank-handler' text property on STRING). |
| 1838 | 1838 | ||
| 1839 | When the yank handler has a non-nil PARAM element, the original STRING | 1839 | When the yank handler has a non-nil PARAM element, the original STRING |
| 1840 | argument is not used by `insert-for-yank'. However, since Lisp code | 1840 | argument is not used by `insert-for-yank'. However, since Lisp code |
| @@ -1863,8 +1863,8 @@ If BEFORE-P is non-nil, prepend STRING to the kill. | |||
| 1863 | Optional third argument YANK-HANDLER specifies the yank-handler text | 1863 | Optional third argument YANK-HANDLER specifies the yank-handler text |
| 1864 | property to be set on the combined kill ring string. If the specified | 1864 | property to be set on the combined kill ring string. If the specified |
| 1865 | yank-handler arg differs from the yank-handler property of the latest | 1865 | yank-handler arg differs from the yank-handler property of the latest |
| 1866 | kill string, STRING is added as a new kill ring element instead of | 1866 | kill string, this function adds the combined string to the kill |
| 1867 | being appending to the last kill. | 1867 | ring as a new element, instead of replacing the last kill with it. |
| 1868 | If `interprogram-cut-function' is set, pass the resulting kill to it." | 1868 | If `interprogram-cut-function' is set, pass the resulting kill to it." |
| 1869 | (let* ((cur (car kill-ring))) | 1869 | (let* ((cur (car kill-ring))) |
| 1870 | (kill-new (if before-p (concat string cur) (concat cur string)) | 1870 | (kill-new (if before-p (concat string cur) (concat cur string)) |