Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f25d60d6
Commit
f25d60d6
authored
Apr 22, 2002
by
Kim F. Storm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(remove_properties): Fixed trap for malformed plist.
parent
0347c911
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
src/ChangeLog
src/ChangeLog
+4
-0
src/textprop.c
src/textprop.c
+6
-7
No files found.
src/ChangeLog
View file @
f25d60d6
2002-04-22 Kim F. Storm <storm@cua.dk>
* textprop.c (remove_properties): Fixed trap for malformed plist.
2002-04-22 Richard M. Stallman <rms@gnu.org>
* window.c (make_window): Initialize height_fixed_p,
...
...
src/textprop.c
View file @
f25d60d6
...
...
@@ -452,15 +452,15 @@ remove_properties (plist, list, i, object)
register
Lisp_Object
tail1
,
tail2
,
sym
,
current_plist
;
register
int
changed
=
0
;
/* Nonzero means tail1 is a list, otherwise it is a
p
list. */
int
use_list
;
/* Nonzero means tail1 is a
p
list, otherwise it is a list. */
int
use_
p
list
;
current_plist
=
i
->
plist
;
if
(
!
NILP
(
plist
))
tail1
=
plist
,
use_list
=
0
;
tail1
=
plist
,
use_
p
list
=
1
;
else
tail1
=
list
,
use_list
=
1
;
tail1
=
list
,
use_
p
list
=
0
;
/* Go through each element of LIST or PLIST. */
while
(
!
NILP
(
tail1
))
...
...
@@ -498,10 +498,9 @@ remove_properties (plist, list, i, object)
}
/* Advance thru TAIL1 one way or the other. */
if
(
use_list
)
tail1
=
XCDR
(
tail1
);
if
(
use_plist
&&
CONSP
(
tail1
))
tail1
=
XCDR
(
tail1
);
else
tail1
=
XCDR
(
XCDR
(
tail1
));
}
if
(
changed
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment