aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-11-10 00:42:42 -0800
committerGlenn Morris2010-11-10 00:42:42 -0800
commitcde08ac929c7c9eb9f6bf75345d56f84b9eaa1fb (patch)
tree82a9094d1f876e208d094366bc4671d1a4dd1c82
parente6068ab30281a6a494b3dbc2287832e2739cd2be (diff)
downloademacs-cde08ac929c7c9eb9f6bf75345d56f84b9eaa1fb.tar.gz
emacs-cde08ac929c7c9eb9f6bf75345d56f84b9eaa1fb.zip
* doc/lispref/text.texi (Kill Functions, Low-Level Kill Ring): Small fixes.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/text.texi16
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5974893288a..5f67371f3a6 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12010-11-10 Glenn Morris <rgm@gnu.org>
2
3 * text.texi (Kill Functions, Low-Level Kill Ring): Small fixes.
4
12010-10-27 Glenn Morris <rgm@gnu.org> 52010-10-27 Glenn Morris <rgm@gnu.org>
2 6
3 * maps.texi (Standard Keymaps): Update File menu description. 7 * maps.texi (Standard Keymaps): Update File menu description.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index a7c4a3e62f4..2510607475b 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -900,10 +900,10 @@ from the buffer. It returns @code{nil}.
900The command does not set @code{this-command} to @code{kill-region}, so a 900The command does not set @code{this-command} to @code{kill-region}, so a
901subsequent kill command does not append to the same kill ring entry. 901subsequent kill command does not append to the same kill ring entry.
902 902
903Don't call @code{copy-region-as-kill} in Lisp programs unless you aim to 903@c FIXME Why is it better? Why isn't copy-region-as-kill obsolete then?
904support Emacs 18. For newer Emacs versions, it is better to use 904@c Why is it used in many places in Emacs?
905@code{kill-new} or @code{kill-append} instead. @xref{Low-Level Kill 905In Lisp programs, it is better to use @code{kill-new} or
906Ring}. 906@code{kill-append} instead of this command. @xref{Low-Level Kill Ring}.
907@end deffn 907@end deffn
908 908
909@node Yanking 909@node Yanking
@@ -1041,8 +1041,8 @@ text property, if there is one.
1041@subsection Low-Level Kill Ring 1041@subsection Low-Level Kill Ring
1042 1042
1043 These functions and variables provide access to the kill ring at a 1043 These functions and variables provide access to the kill ring at a
1044lower level, but still convenient for use in Lisp programs, because they 1044lower level, but are still convenient for use in Lisp programs,
1045take care of interaction with window system selections 1045because they take care of interaction with window system selections
1046(@pxref{Window System Selections}). 1046(@pxref{Window System Selections}).
1047 1047
1048@defun current-kill n &optional do-not-move 1048@defun current-kill n &optional do-not-move
@@ -4279,6 +4279,4 @@ code that is itself run from a modification hook, then rebind locally
4279@code{inhibit-modification-hooks} to @code{nil}. 4279@code{inhibit-modification-hooks} to @code{nil}.
4280@end defvar 4280@end defvar
4281 4281
4282@ignore 4282
4283 arch-tag: 3721e738-a1cb-4085-bc1a-6cb8d8e1d32b
4284@end ignore