From: Luc Teirlinck Date: Thu, 12 Feb 2004 04:23:54 +0000 (+0000) Subject: (kill-append): Doc fix. X-Git-Tag: ttn-vms-21-2-B4~7647 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fb2dcf046cbf7b5abea7478725ba50059d389cfc;p=emacs.git (kill-append): Doc fix. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f45a4051bb3..8a93bde3575 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2004-02-11 Luc Teirlinck + * simple.el (kill-append): Doc fix. + * emacs-lisp/lisp-mode.el (lisp-mode-variables): Adapt outline-regexp to the new conventions for commenting out code. 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. Optional third arguments YANK-HANDLER controls how the STRING is later inserted into a buffer; see `insert-for-yank' for details. When a yank handler is specified, STRING must be non-empty (the yank -handler is stored as a `yank-handler'text property on STRING). +handler is stored as a `yank-handler' text property on STRING). When the yank handler has a non-nil PARAM element, the original STRING 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. Optional third argument YANK-HANDLER specifies the yank-handler text property to be set on the combined kill ring string. If the specified yank-handler arg differs from the yank-handler property of the latest -kill string, STRING is added as a new kill ring element instead of -being appending to the last kill. +kill string, this function adds the combined string to the kill +ring as a new element, instead of replacing the last kill with it. If `interprogram-cut-function' is set, pass the resulting kill to it." (let* ((cur (car kill-ring))) (kill-new (if before-p (concat string cur) (concat cur string))