aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2001-02-15 12:36:44 +0000
committerEli Zaretskii2001-02-15 12:36:44 +0000
commit25078b542c45351c7c759c2f7b19e5b6e7dcad78 (patch)
tree08e02662473e4625b2ce3268919c7964b24fb7a5 /src
parent8399f8a0cd00d4c2f99e20585bb6d2d70d7177af (diff)
downloademacs-25078b542c45351c7c759c2f7b19e5b6e7dcad78.tar.gz
emacs-25078b542c45351c7c759c2f7b19e5b6e7dcad78.zip
(Fset_text_properties): Doc fix.
Diffstat (limited to 'src')
-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 @@
12001-02-15 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * textprop.c (Fset_text_properties): Doc fix.
4
12001-02-15 Gerd Moellmann <gerd@gnu.org> 52001-02-15 Gerd Moellmann <gerd@gnu.org>
2 6
3 * dispnew.c (update_text_area): Undo change of 2001-01-12. 7 * 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,
1218The third argument PROPERTIES is the new property list.\n\ 1218The third argument PROPERTIES is the new property list.\n\
1219The optional fourth argument, OBJECT,\n\ 1219The optional fourth argument, OBJECT,\n\
1220is the string or buffer containing the text.\n\ 1220is the string or buffer containing the text.\n\
1221If OBJECT is omitted or nil, it defaults to the current buffer.") 1221If OBJECT is omitted or nil, it defaults to the current buffer.\n\
1222If PROPERTIES is nil, the effect is to remove all properties from\n\
1223the designated part of OBJECT.")
1222 (start, end, properties, object) 1224 (start, end, properties, object)
1223 Lisp_Object start, end, properties, object; 1225 Lisp_Object start, end, properties, object;
1224{ 1226{