merge from trunk

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
 text anyway.)
 @end defun
 
+@c FIXME: Add an index for yank-handler.
   If you put a @code{yank-handler} text property on all or part of a
 string, that alters how @code{insert-for-yank} inserts the string.  If
 different 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 @@
         New functions.
         (image-animate-timeout): Respect image :speed property.
 
-2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
-
-        * simple.el (copy-region-as-kill, kill-ring-save): Advertise using
-        `kill-new' and `kill-append' in Lisp programs.
-
 2013-08-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * 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.
 If `interprogram-cut-function' is non-nil, also save the text for a window
 system cut and paste.
 
-This command's old key binding has been given to `kill-ring-save'.
-
-Do not use this function in Lisp programs, use `kill-new' or
-`kill-append' instead."
+This command's old key binding has been given to `kill-ring-save'."
   (interactive "r")
   (if (eq last-command 'kill-region)
       (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,
 use \\[append-next-kill] before \\[kill-ring-save].
 
 This command is similar to `copy-region-as-kill', except that it gives
-visual feedback indicating the extent of the region being copied.
-
-Do not use this function in Lisp programs, use `kill-new' or
-`kill-append' instead."
+visual feedback indicating the extent of the region being copied."
   (interactive "r")
   (copy-region-as-kill beg end)
   ;; This use of called-interactively-p is correct because the code it