aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-02-16 12:09:39 +0000
committerEli Zaretskii2001-02-16 12:09:39 +0000
commit815588675f7851e5d23dd1edfa4fa528cfd81b3c (patch)
treec38b569e9a20de5ba494049e658d74e61c11f2f0
parent0d140e65afcce8472e34189a6db8036a1a481a3a (diff)
downloademacs-815588675f7851e5d23dd1edfa4fa528cfd81b3c.tar.gz
emacs-815588675f7851e5d23dd1edfa4fa528cfd81b3c.zip
(kill-region, kill-line, kill-ring-save): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el12
2 files changed, 13 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30eba6bf269..ecb3b657807 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12001-02-16 Eli Zaretskii <eliz@is.elta.co.il> 12001-02-16 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * simple.el (kill-region, kill-line, kill-ring-save): Doc fix.
4
3 * progmodes/compile.el (grep-regexp-alist): Remove the blank from 5 * progmodes/compile.el (grep-regexp-alist): Remove the blank from
4 the character class after the (optional) drive, to support file 6 the character class after the (optional) drive, to support file
5 names with embedded blanks. 7 names with embedded blanks.
diff --git a/lisp/simple.el b/lisp/simple.el
index bb8f3c72126..510c07e8ddc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1753,7 +1753,11 @@ yanking point; just return the Nth kill forward."
1753 "Kill between point and mark. 1753 "Kill between point and mark.
1754The text is deleted but saved in the kill ring. 1754The text is deleted but saved in the kill ring.
1755The command \\[yank] can retrieve it from there. 1755The command \\[yank] can retrieve it from there.
1756\(If you want to kill and then yank immediately, use \\[copy-region-as-kill].) 1756\(If you want to kill and then yank immediately, use \\[kill-ring-save].)
1757
1758If you want to append the killed region to the last killed text,
1759use \\[append-next-kill] before \\[kill-region].
1760
1757If the buffer is read-only, Emacs will beep and refrain from deleting 1761If the buffer is read-only, Emacs will beep and refrain from deleting
1758the text, but put the text in the kill ring anyway. This means that 1762the text, but put the text in the kill ring anyway. This means that
1759you can use the killing commands to copy text from a read-only buffer. 1763you can use the killing commands to copy text from a read-only buffer.
@@ -1813,6 +1817,9 @@ In Transient Mark mode, deactivate the mark.
1813If `interprogram-cut-function' is non-nil, also save the text for a window 1817If `interprogram-cut-function' is non-nil, also save the text for a window
1814system cut and paste. 1818system cut and paste.
1815 1819
1820If you want to append the killed line to the last killed text,
1821use \\[append-next-kill] before \\[kill-ring-save].
1822
1816This command is similar to `copy-region-as-kill', except that it gives 1823This command is similar to `copy-region-as-kill', except that it gives
1817visual feedback indicating the extent of the region being copied." 1824visual feedback indicating the extent of the region being copied."
1818 (interactive "r") 1825 (interactive "r")
@@ -2015,6 +2022,9 @@ including its terminating newline, when used at the beginning of a line
2015with no argument. As a consequence, you can always kill a whole line 2022with no argument. As a consequence, you can always kill a whole line
2016by typing \\[beginning-of-line] \\[kill-line]. 2023by typing \\[beginning-of-line] \\[kill-line].
2017 2024
2025If you want to append the killed line to the last killed text,
2026use \\[append-next-kill] before \\[kill-line].
2027
2018If the buffer is read-only, Emacs will beep and refrain from deleting 2028If the buffer is read-only, Emacs will beep and refrain from deleting
2019the line, but put the line in the kill ring anyway. This means that 2029the line, but put the line in the kill ring anyway. This means that
2020you can use this command to copy text from a read-only buffer." 2030you can use this command to copy text from a read-only buffer."