aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog7
-rw-r--r--doc/lispref/package.texi3
-rw-r--r--doc/lispref/text.texi18
3 files changed, 23 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index fa5aac6e9ec..345e69e6989 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
12011-10-13 Chong Yidong <cyd@stupidchicken.com>
2
3 * text.texi (Yanking): Document yank-excluded-properties.
4
5 * package.texi (Packaging Basics): The commentary should say how
6 to begin using the package.
7
12011-10-11 Martin Rudalics <rudalics@gmx.at> 82011-10-11 Martin Rudalics <rudalics@gmx.at>
2 9
3 * windows.texi (Deleting Windows): Mention which window gets 10 * windows.texi (Deleting Windows): Mention which window gets
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 62fbc2a9a07..5533f8ab5fa 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -63,7 +63,8 @@ should occupy a single line, ideally in 36 characters or less.
63This is shown in the buffer created by @kbd{C-h P} 63This is shown in the buffer created by @kbd{C-h P}
64(@code{describe-package}), following the package's brief description 64(@code{describe-package}), following the package's brief description
65and installation status. It normally spans multiple lines, and should 65and installation status. It normally spans multiple lines, and should
66fully describe the package and its capabilities. 66fully describe the package's capabilities and how to begin using it
67once it is installed.
67 68
68@item Dependencies 69@item Dependencies
69A list of other packages (possibly including minimal acceptable 70A list of other packages (possibly including minimal acceptable
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 2348e3706dc..3a081dddc61 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -907,10 +907,11 @@ text that they copy into the buffer.
907 907
908@defun insert-for-yank string 908@defun insert-for-yank string
909This function normally works like @code{insert} except that it doesn't 909This function normally works like @code{insert} except that it doesn't
910insert the text properties in the @code{yank-excluded-properties} 910insert the text properties (@pxref{Text Properties}) in the list
911list. However, if any part of @var{string} has a non-@code{nil} 911variable @code{yank-excluded-properties}. However, if any part of
912@code{yank-handler} text property, that property can do various 912@var{string} has a non-@code{nil} @code{yank-handler} text property,
913special processing on that part of the text being inserted. 913that property can do various special processing on that part of the
914text being inserted.
914@end defun 915@end defun
915 916
916@defun insert-buffer-substring-as-yank buf &optional start end 917@defun insert-buffer-substring-as-yank buf &optional start end
@@ -958,6 +959,15 @@ region. @var{function} can set @code{yank-undo-function} to override
958the @var{undo} value. 959the @var{undo} value.
959@end table 960@end table
960 961
962@cindex yanking and text properties
963@defopt yank-excluded-properties
964Yanking discards certain text properties from the yanked text, as
965described above. The value of this variable is the list of properties
966to discard. Its default value contains properties that might lead to
967annoying results, such as causing the text to respond to the mouse or
968specifying key bindings.
969@end defopt
970
961@node Yank Commands 971@node Yank Commands
962@comment node-name, next, previous, up 972@comment node-name, next, previous, up
963@subsection Functions for Yanking 973@subsection Functions for Yanking