diff options
| author | Eli Zaretskii | 2005-05-22 20:58:52 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2005-05-22 20:58:52 +0000 |
| commit | a0e8eaa34553e47fd22ba329f42e902f38415dbd (patch) | |
| tree | cff681a8ec920d692a95866c05bbda3a055f5d58 | |
| parent | 6cd0254fe9957d0e4ffd769af5332f828b75428d (diff) | |
| download | emacs-a0e8eaa34553e47fd22ba329f42e902f38415dbd.tar.gz emacs-a0e8eaa34553e47fd22ba329f42e902f38415dbd.zip | |
(yank, yank-pop): Mention `yank-excluded-properties'
and `yank-handler' in the doc strings.
| -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 @@ | |||
| 1 | 2005-05-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (yank, yank-pop): Mention `yank-excluded-properties' | ||
| 4 | and `yank-handler' in the doc strings. | ||
| 5 | |||
| 1 | 2005-05-22 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2005-05-22 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl.el (eql): Remove. It's a builtin already. | 8 | * 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. | |||
| 2568 | If N is negative, this is a more recent kill. | 2568 | If N is negative, this is a more recent kill. |
| 2569 | 2569 | ||
| 2570 | The sequence of kills wraps around, so that after the oldest one | 2570 | The sequence of kills wraps around, so that after the oldest one |
| 2571 | comes the newest one." | 2571 | comes the newest one. |
| 2572 | |||
| 2573 | When this command inserts killed text into the buffer, it honors | ||
| 2574 | `yank-excluded-properties' and `yank-handler' as described in the | ||
| 2575 | doc string for `insert-for-yank-1', which see." | ||
| 2572 | (interactive "*p") | 2576 | (interactive "*p") |
| 2573 | (if (not (eq last-command 'yank)) | 2577 | (if (not (eq last-command 'yank)) |
| 2574 | (error "Previous command was not a yank")) | 2578 | (error "Previous command was not a yank")) |
| @@ -2600,6 +2604,11 @@ killed OR yanked. Put point at end, and set mark at beginning. | |||
| 2600 | With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). | 2604 | With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). |
| 2601 | With argument N, reinsert the Nth most recently killed stretch of killed | 2605 | With argument N, reinsert the Nth most recently killed stretch of killed |
| 2602 | text. | 2606 | text. |
| 2607 | |||
| 2608 | When this command inserts killed text into the buffer, it honors | ||
| 2609 | `yank-excluded-properties' and `yank-handler' as described in the | ||
| 2610 | doc string for `insert-for-yank-1', which see. | ||
| 2611 | |||
| 2603 | See also the command \\[yank-pop]." | 2612 | See also the command \\[yank-pop]." |
| 2604 | (interactive "*P") | 2613 | (interactive "*P") |
| 2605 | (setq yank-window-start (window-start)) | 2614 | (setq yank-window-start (window-start)) |