aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-08-16 16:27:49 +0800
committerXue Fuqiao2013-08-16 16:27:49 +0800
commit907699465f53525f28c3cbdc55cebcc421e0295c (patch)
tree0f42f61b43086afd513e6fa55f19a420bab23af6
parent7bef426b5fae3c0041a96cf1a3897e8b3486a673 (diff)
downloademacs-907699465f53525f28c3cbdc55cebcc421e0295c.tar.gz
emacs-907699465f53525f28c3cbdc55cebcc421e0295c.zip
Reverse previous change, because kill-{new, append} don't have obvious advantage.
-rw-r--r--doc/lispref/text.texi1
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el10
3 files changed, 3 insertions, 13 deletions
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index b97faf54752..3057b40066f 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -924,6 +924,7 @@ processes the text according to @code{yank-handled-properties} and
924text anyway.) 924text anyway.)
925@end defun 925@end defun
926 926
927@c FIXME: Add an index for yank-handler.
927 If you put a @code{yank-handler} text property on all or part of a 928 If you put a @code{yank-handler} text property on all or part of a
928string, that alters how @code{insert-for-yank} inserts the string. If 929string, that alters how @code{insert-for-yank} inserts the string. If
929different parts of the string have different @code{yank-handler} 930different parts of the string have different @code{yank-handler}
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39279242d37..5edb462adb5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -23,11 +23,6 @@
23 New functions. 23 New functions.
24 (image-animate-timeout): Respect image :speed property. 24 (image-animate-timeout): Respect image :speed property.
25 25
262013-08-16 Xue Fuqiao <xfq.free@gmail.com>
27
28 * simple.el (copy-region-as-kill, kill-ring-save): Advertise using
29 `kill-new' and `kill-append' in Lisp programs.
30
312013-08-15 Stefan Monnier <monnier@iro.umontreal.ca> 262013-08-15 Stefan Monnier <monnier@iro.umontreal.ca>
32 27
33 * emacs-lisp/debug.el (debugger-setup-buffer): Put point on the 28 * emacs-lisp/debug.el (debugger-setup-buffer): Put point on the
diff --git a/lisp/simple.el b/lisp/simple.el
index bad0449d815..6825c41becc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3622,10 +3622,7 @@ In Transient Mark mode, deactivate the mark.
3622If `interprogram-cut-function' is non-nil, also save the text for a window 3622If `interprogram-cut-function' is non-nil, also save the text for a window
3623system cut and paste. 3623system cut and paste.
3624 3624
3625This command's old key binding has been given to `kill-ring-save'. 3625This command's old key binding has been given to `kill-ring-save'."
3626
3627Do not use this function in Lisp programs, use `kill-new' or
3628`kill-append' instead."
3629 (interactive "r") 3626 (interactive "r")
3630 (if (eq last-command 'kill-region) 3627 (if (eq last-command 'kill-region)
3631 (kill-append (filter-buffer-substring beg end) (< end beg)) 3628 (kill-append (filter-buffer-substring beg end) (< end beg))
@@ -3643,10 +3640,7 @@ If you want to append the killed line to the last killed text,
3643use \\[append-next-kill] before \\[kill-ring-save]. 3640use \\[append-next-kill] before \\[kill-ring-save].
3644 3641
3645This command is similar to `copy-region-as-kill', except that it gives 3642This command is similar to `copy-region-as-kill', except that it gives
3646visual feedback indicating the extent of the region being copied. 3643visual feedback indicating the extent of the region being copied."
3647
3648Do not use this function in Lisp programs, use `kill-new' or
3649`kill-append' instead."
3650 (interactive "r") 3644 (interactive "r")
3651 (copy-region-as-kill beg end) 3645 (copy-region-as-kill beg end)
3652 ;; This use of called-interactively-p is correct because the code it 3646 ;; This use of called-interactively-p is correct because the code it