diff options
| author | Karoly Lorentey | 2005-09-05 14:21:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-09-05 14:21:08 +0000 |
| commit | 6f5b225036d2dd45cb413d9b373abae8cb44a2eb (patch) | |
| tree | 7876bf4c58b1e7d3f6f2db39d02052298c64f4d1 /src/editfns.c | |
| parent | 4bed7e65b4c7c2702b499e874f6bc599045b3c07 (diff) | |
| parent | 656f8fc5fd872e6b4d5ca65ec95e205e21a5bf13 (diff) | |
| download | emacs-6f5b225036d2dd45cb413d9b373abae8cb44a2eb.tar.gz emacs-6f5b225036d2dd45cb413d9b373abae8cb44a2eb.zip | |
Merged in changes from CVS trunk. (Testing my own CVS gateway.)
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-3
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-395
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/editfns.c b/src/editfns.c index da4533d2537..a05d2396448 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3260,10 +3260,7 @@ usage: (propertize STRING &rest PROPERTIES) */) | |||
| 3260 | string = Fcopy_sequence (args[0]); | 3260 | string = Fcopy_sequence (args[0]); |
| 3261 | 3261 | ||
| 3262 | for (i = 1; i < nargs; i += 2) | 3262 | for (i = 1; i < nargs; i += 2) |
| 3263 | { | 3263 | properties = Fcons (args[i], Fcons (args[i + 1], properties)); |
| 3264 | CHECK_SYMBOL (args[i]); | ||
| 3265 | properties = Fcons (args[i], Fcons (args[i + 1], properties)); | ||
| 3266 | } | ||
| 3267 | 3264 | ||
| 3268 | Fadd_text_properties (make_number (0), | 3265 | Fadd_text_properties (make_number (0), |
| 3269 | make_number (SCHARS (string)), | 3266 | make_number (SCHARS (string)), |