diff options
| author | Chong Yidong | 2010-02-16 09:40:45 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-02-16 09:40:45 -0500 |
| commit | e8ab39085de0c0989f15f8d0bbd15f70173c9671 (patch) | |
| tree | b1d566476e1e0f2f44dd0ec9c214094d6d281572 | |
| parent | ff90f4b003b3de7b053ad9ab4e16cc8cf81917c0 (diff) | |
| download | emacs-e8ab39085de0c0989f15f8d0bbd15f70173c9671.tar.gz emacs-e8ab39085de0c0989f15f8d0bbd15f70173c9671.zip | |
* simple.el (save-interprogram-paste-before-kill): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 33d844512de..64dff020286 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-02-16 Chong Yidong <cyd@stupidchicken.com> | 1 | 2010-02-16 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * simple.el (save-interprogram-paste-before-kill): Doc fix. | ||
| 4 | |||
| 3 | * cus-edit.el (hardware): Doc fix. | 5 | * cus-edit.el (hardware): Doc fix. |
| 4 | 6 | ||
| 5 | * man.el (man): Add to external custom group. | 7 | * man.el (man): Add to external custom group. |
diff --git a/lisp/simple.el b/lisp/simple.el index 4e9ffdc9740..30498ea2704 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -2806,7 +2806,7 @@ ring directly.") | |||
| 2806 | "The tail of the kill ring whose car is the last thing yanked.") | 2806 | "The tail of the kill ring whose car is the last thing yanked.") |
| 2807 | 2807 | ||
| 2808 | (defcustom save-interprogram-paste-before-kill nil | 2808 | (defcustom save-interprogram-paste-before-kill nil |
| 2809 | "Save the paste strings into `kill-ring' before replacing it with emacs strings. | 2809 | "Save clipboard strings into kill ring before replacing them. |
| 2810 | When one selects something in another program to paste it into Emacs, | 2810 | When one selects something in another program to paste it into Emacs, |
| 2811 | but kills something in Emacs before actually pasting it, | 2811 | but kills something in Emacs before actually pasting it, |
| 2812 | this selection is gone unless this variable is non-nil, | 2812 | this selection is gone unless this variable is non-nil, |