aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2001-11-15 00:34:53 +0000
committerRichard M. Stallman2001-11-15 00:34:53 +0000
commitd2936d21a1168390b2798956db4638b21906afbf (patch)
treea1a11127c730e2078a259528e6dcd76061bbb640 /src
parentc26e3f6c55cf2b52f760b3e92b7d41d47dba79f3 (diff)
downloademacs-d2936d21a1168390b2798956db4638b21906afbf.tar.gz
emacs-d2936d21a1168390b2798956db4638b21906afbf.zip
(Fpropertize): Allow call with 1 arg.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/editfns.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9b999fd0b5a..b480f00e0d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12001-11-14 Richard M. Stallman <rms@gnu.org> 12001-11-14 Richard M. Stallman <rms@gnu.org>
2 2
3 * editfns.c (Fpropertize): Allow call with 1 arg.
4
3 * dispextern.h (image_background, image_background_transparent): 5 * dispextern.h (image_background, image_background_transparent):
4 Conditionalize on HAVE_X_WINDOWS. 6 Conditionalize on HAVE_X_WINDOWS.
5 7
diff --git a/src/editfns.c b/src/editfns.c
index 7f94150d0ee..abecfa94466 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3082,7 +3082,7 @@ DEFUN ("current-message", Fcurrent_message, Scurrent_message, 0, 0, 0,
3082} 3082}
3083 3083
3084 3084
3085DEFUN ("propertize", Fpropertize, Spropertize, 3, MANY, 0, 3085DEFUN ("propertize", Fpropertize, Spropertize, 1, MANY, 0,
3086 doc: /* Return a copy of STRING with text properties added. 3086 doc: /* Return a copy of STRING with text properties added.
3087First argument is the string to copy. 3087First argument is the string to copy.
3088Remaining arguments form a sequence of PROPERTY VALUE pairs for text 3088Remaining arguments form a sequence of PROPERTY VALUE pairs for text
@@ -3097,7 +3097,7 @@ usage: (propertize STRING &rest PROPERTIES) */)
3097 int i; 3097 int i;
3098 3098
3099 /* Number of args must be odd. */ 3099 /* Number of args must be odd. */
3100 if ((nargs & 1) == 0 || nargs < 3) 3100 if ((nargs & 1) == 0 || nargs < 1)
3101 error ("Wrong number of arguments"); 3101 error ("Wrong number of arguments");
3102 3102
3103 properties = string = Qnil; 3103 properties = string = Qnil;