aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2015-12-07 18:20:43 +0200
committerEli Zaretskii2015-12-07 18:20:43 +0200
commit86130adf1ef6ca8e8feabcc0fe966f84bf5d42dc (patch)
tree810bb3c9399a49a66c7be910fbec3660f54f85bc /lisp
parenteb85d55cea4c5a715c4381ab6aeee630183fa23e (diff)
downloademacs-86130adf1ef6ca8e8feabcc0fe966f84bf5d42dc.tar.gz
emacs-86130adf1ef6ca8e8feabcc0fe966f84bf5d42dc.zip
Improve documentation of kill commands
* lisp/simple.el (region-extract-function, delete-backward-char) (delete-forward-char, kill-region, copy-region-as-kill) (kill-ring-save): Better document the optional argument REGION in the doc strings. Mention in the doc strings that text put in the kill-ring can be filtered by 'filter-buffer-substring'. * doc/lispref/text.texi (Kill Functions): Mention that functions described in this subsection can filter text they put in the kill-ring. Add a cross-reference to "Buffer Contents" and an index entry. Document the optional argument 'region' and its effect. (Bug#21315)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/simple.el55
1 files changed, 40 insertions, 15 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 2ccb016aca5..17b9c918ead 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -974,7 +974,8 @@ If DELETE is `delete-only', then only delete the region and the return value
974is undefined. If DELETE is nil, just return the content as a string. 974is undefined. If DELETE is nil, just return the content as a string.
975If DELETE is `bounds', then don't delete, but just return the 975If DELETE is `bounds', then don't delete, but just return the
976boundaries of the region as a list of (START . END) positions. 976boundaries of the region as a list of (START . END) positions.
977If anything else, delete the region and return its content as a string.") 977If anything else, delete the region and return its content as a string,
978after filtering it with `filter-buffer-substring'.")
978 979
979(defvar region-insert-function 980(defvar region-insert-function
980 (lambda (lines) 981 (lambda (lines)
@@ -999,6 +1000,10 @@ Optional second arg KILLFLAG, if non-nil, means to kill (save in
999kill ring) instead of delete. Interactively, N is the prefix 1000kill ring) instead of delete. Interactively, N is the prefix
1000arg, and KILLFLAG is set if N is explicitly specified. 1001arg, and KILLFLAG is set if N is explicitly specified.
1001 1002
1003When killing, the killed text is filtered by
1004`filter-buffer-substring' before it is saved in the kill ring, so
1005the actual saved text might be different from what was killed.
1006
1002In Overwrite mode, single character backward deletion may replace 1007In Overwrite mode, single character backward deletion may replace
1003tabs with spaces so as to back over columns, unless point is at 1008tabs with spaces so as to back over columns, unless point is at
1004the end of the line." 1009the end of the line."
@@ -1034,7 +1039,11 @@ To disable this, set variable `delete-active-region' to nil.
1034 1039
1035Optional second arg KILLFLAG non-nil means to kill (save in kill 1040Optional second arg KILLFLAG non-nil means to kill (save in kill
1036ring) instead of delete. Interactively, N is the prefix arg, and 1041ring) instead of delete. Interactively, N is the prefix arg, and
1037KILLFLAG is set if N was explicitly specified." 1042KILLFLAG is set if N was explicitly specified.
1043
1044When killing, the killed text is filtered by
1045`filter-buffer-substring' before it is saved in the kill ring, so
1046the actual saved text might be different from what was killed."
1038 (declare (interactive-only delete-char)) 1047 (declare (interactive-only delete-char))
1039 (interactive "p\nP") 1048 (interactive "p\nP")
1040 (unless (integerp n) 1049 (unless (integerp n)
@@ -4249,21 +4258,25 @@ The command \\[yank] can retrieve it from there.
4249If you want to append the killed region to the last killed text, 4258If you want to append the killed region to the last killed text,
4250use \\[append-next-kill] before \\[kill-region]. 4259use \\[append-next-kill] before \\[kill-region].
4251 4260
4261Any command that calls this function is a \"kill command\".
4262If the previous command was also a kill command,
4263the text killed this time appends to the text killed last time
4264to make one entry in the kill ring.
4265
4266The killed text is filtered by `filter-buffer-substring' before it is
4267saved in the kill ring, so the actual saved text might be different
4268from what was killed.
4269
4252If the buffer is read-only, Emacs will beep and refrain from deleting 4270If the buffer is read-only, Emacs will beep and refrain from deleting
4253the text, but put the text in the kill ring anyway. This means that 4271the text, but put the text in the kill ring anyway. This means that
4254you can use the killing commands to copy text from a read-only buffer. 4272you can use the killing commands to copy text from a read-only buffer.
4255 4273
4256Lisp programs should use this function for killing text. 4274Lisp programs should use this function for killing text.
4257 (To delete text, use `delete-region'.) 4275 (To delete text, use `delete-region'.)
4258Supply two arguments, character positions indicating the stretch of text 4276Supply two arguments, character positions BEG and END indicating the
4259 to be killed. 4277 stretch of text to be killed. If the optional argument REGION is
4260Any command that calls this function is a \"kill command\". 4278 non-nil, the function ignores BEG and END, and kills the current
4261If the previous command was also a kill command, 4279 region instead."
4262the text killed this time appends to the text killed last time
4263to make one entry in the kill ring.
4264
4265The optional argument REGION if non-nil, indicates that we're not just killing
4266some text between BEG and END, but we're killing the region."
4267 ;; Pass mark first, then point, because the order matters when 4280 ;; Pass mark first, then point, because the order matters when
4268 ;; calling `kill-append'. 4281 ;; calling `kill-append'.
4269 (interactive (list (mark) (point) 'region)) 4282 (interactive (list (mark) (point) 'region))
@@ -4308,8 +4321,14 @@ In Transient Mark mode, deactivate the mark.
4308If `interprogram-cut-function' is non-nil, also save the text for a window 4321If `interprogram-cut-function' is non-nil, also save the text for a window
4309system cut and paste. 4322system cut and paste.
4310 4323
4311The optional argument REGION if non-nil, indicates that we're not just copying 4324The copied text is filtered by `filter-buffer-substring' before it is
4312some text between BEG and END, but we're copying the region. 4325saved in the kill ring, so the actual saved text might be different
4326from what was in the buffer.
4327
4328When called from Lisp, save in the kill ring the stretch of text
4329between BEG and END, unless the optional argument REGION is
4330non-nil, in which case ignore BEG and END, and save the current
4331region instead.
4313 4332
4314This command's old key binding has been given to `kill-ring-save'." 4333This command's old key binding has been given to `kill-ring-save'."
4315 ;; Pass mark first, then point, because the order matters when 4334 ;; Pass mark first, then point, because the order matters when
@@ -4334,8 +4353,14 @@ system cut and paste.
4334If you want to append the killed line to the last killed text, 4353If you want to append the killed line to the last killed text,
4335use \\[append-next-kill] before \\[kill-ring-save]. 4354use \\[append-next-kill] before \\[kill-ring-save].
4336 4355
4337The optional argument REGION if non-nil, indicates that we're not just copying 4356The copied text is filtered by `filter-buffer-substring' before it is
4338some text between BEG and END, but we're copying the region. 4357saved in the kill ring, so the actual saved text might be different
4358from what was in the buffer.
4359
4360When called from Lisp, save in the kill ring the stretch of text
4361between BEG and END, unless the optional argument REGION is
4362non-nil, in which case ignore BEG and END, and save the current
4363region instead.
4339 4364
4340This command is similar to `copy-region-as-kill', except that it gives 4365This command is similar to `copy-region-as-kill', except that it gives
4341visual feedback indicating the extent of the region being copied." 4366visual feedback indicating the extent of the region being copied."