summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2001-02-15 12:36:44 +0000
committerEli Zaretskii <eliz@gnu.org>2001-02-15 12:36:44 +0000
commit25078b542c45351c7c759c2f7b19e5b6e7dcad78 (patch)
tree08e02662473e4625b2ce3268919c7964b24fb7a5
parent8399f8a0cd00d4c2f99e20585bb6d2d70d7177af (diff)
downloademacs-25078b542c45351c7c759c2f7b19e5b6e7dcad78.tar.gz
(Fset_text_properties): Doc fix.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/textprop.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 295773aabaa..e004696d3c0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-15 Eli Zaretskii <eliz@is.elta.co.il>
+
+ * textprop.c (Fset_text_properties): Doc fix.
+
2001-02-15 Gerd Moellmann <gerd@gnu.org>
* dispnew.c (update_text_area): Undo change of 2001-01-12.
diff --git a/src/textprop.c b/src/textprop.c
index a84d618ce69..87a3c09cc11 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1218,7 +1218,9 @@ DEFUN ("set-text-properties", Fset_text_properties,
The third argument PROPERTIES is the new property list.\n\
The optional fourth argument, OBJECT,\n\
is the string or buffer containing the text.\n\
-If OBJECT is omitted or nil, it defaults to the current buffer.")
+If OBJECT is omitted or nil, it defaults to the current buffer.\n\
+If PROPERTIES is nil, the effect is to remove all properties from\n\
+the designated part of OBJECT.")
(start, end, properties, object)
Lisp_Object start, end, properties, object;
{