diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 12d0697044b..561610f2181 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-05-22 Eli Zaretskii <eliz@gnu.org> + + * simple.el (yank, yank-pop): Mention `yank-excluded-properties' + and `yank-handler' in the doc strings. + 2005-05-22 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/cl.el (eql): Remove. It's a builtin already. diff --git a/lisp/simple.el b/lisp/simple.el index 5a94c28828d..3c9ea979fed 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2568,7 +2568,11 @@ With argument N, insert the Nth previous kill. If N is negative, this is a more recent kill. The sequence of kills wraps around, so that after the oldest one -comes the newest one." +comes the newest one. + +When this command inserts killed text into the buffer, it honors +`yank-excluded-properties' and `yank-handler' as described in the +doc string for `insert-for-yank-1', which see." (interactive "*p") (if (not (eq last-command 'yank)) (error "Previous command was not a yank")) @@ -2600,6 +2604,11 @@ killed OR yanked. Put point at end, and set mark at beginning. With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). With argument N, reinsert the Nth most recently killed stretch of killed text. + +When this command inserts killed text into the buffer, it honors +`yank-excluded-properties' and `yank-handler' as described in the +doc string for `insert-for-yank-1', which see. + See also the command \\[yank-pop]." (interactive "*P") (setq yank-window-start (window-start)) |