aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-08-16 16:11:44 +0800
committerXue Fuqiao2013-08-16 16:11:44 +0800
commit7bef426b5fae3c0041a96cf1a3897e8b3486a673 (patch)
tree954b23910a5c595362bd02012d1372711f03f846
parent86837e815eb3c9a9776df3aa8f1f23877f748340 (diff)
downloademacs-7bef426b5fae3c0041a96cf1a3897e8b3486a673.tar.gz
emacs-7bef426b5fae3c0041a96cf1a3897e8b3486a673.zip
Advertise using `kill-new' and `kill-append' in Lisp programs.
* lisp/simple.el (copy-region-as-kill, kill-ring-save): Advertise using `kill-new' and `kill-append' in Lisp programs.
-rw-r--r--doc/emacs/killing.texi2
-rw-r--r--doc/lispref/text.texi1
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el10
4 files changed, 16 insertions, 2 deletions
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 051bfe3eae8..cb33327faa1 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -109,6 +109,8 @@ number of characters. If the numeric argument is omitted or one, they
109delete all the text in the region if it is active (@pxref{Using 109delete all the text in the region if it is active (@pxref{Using
110Region}). 110Region}).
111 111
112@c FIXME: `cycle-spacing' should be documented, too. (Maybe not in
113@c this node, tho.) --xfq
112@kindex M-\ 114@kindex M-\
113@findex delete-horizontal-space 115@findex delete-horizontal-space
114@kindex M-SPC 116@kindex M-SPC
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index a1b78b213b1..b97faf54752 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -779,6 +779,7 @@ is deleted. If point is on a nonblank line, the command deletes all
779blank lines immediately following it. 779blank lines immediately following it.
780 780
781A blank line is defined as a line containing only tabs and spaces. 781A blank line is defined as a line containing only tabs and spaces.
782@c and the Newline character?
782 783
783@code{delete-blank-lines} returns @code{nil}. 784@code{delete-blank-lines} returns @code{nil}.
784@end deffn 785@end deffn
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5edb462adb5..39279242d37 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -23,6 +23,11 @@
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
262013-08-15 Stefan Monnier <monnier@iro.umontreal.ca> 312013-08-15 Stefan Monnier <monnier@iro.umontreal.ca>
27 32
28 * emacs-lisp/debug.el (debugger-setup-buffer): Put point on the 33 * emacs-lisp/debug.el (debugger-setup-buffer): Put point on the
diff --git a/lisp/simple.el b/lisp/simple.el
index 6825c41becc..bad0449d815 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3622,7 +3622,10 @@ 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."
3626 (interactive "r") 3629 (interactive "r")
3627 (if (eq last-command 'kill-region) 3630 (if (eq last-command 'kill-region)
3628 (kill-append (filter-buffer-substring beg end) (< end beg)) 3631 (kill-append (filter-buffer-substring beg end) (< end beg))
@@ -3640,7 +3643,10 @@ If you want to append the killed line to the last killed text,
3640use \\[append-next-kill] before \\[kill-ring-save]. 3643use \\[append-next-kill] before \\[kill-ring-save].
3641 3644
3642This command is similar to `copy-region-as-kill', except that it gives 3645This command is similar to `copy-region-as-kill', except that it gives
3643visual feedback indicating the extent of the region being copied." 3646visual 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."
3644 (interactive "r") 3650 (interactive "r")
3645 (copy-region-as-kill beg end) 3651 (copy-region-as-kill beg end)
3646 ;; This use of called-interactively-p is correct because the code it 3652 ;; This use of called-interactively-p is correct because the code it