Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
0699fc18
Commit
0699fc18
authored
Sep 06, 2012
by
Dmitry Antipov
Browse files
* alloc.c (mark_object): Revert window marking code
since it's unsafe for the Fset_window_configuration.
parent
4fd78b62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
15 deletions
+16
-15
src/ChangeLog
src/ChangeLog
+5
-0
src/alloc.c
src/alloc.c
+11
-15
No files found.
src/ChangeLog
View file @
0699fc18
2012-09-06 Dmitry Antipov <dmantipov@yandex.ru>
* alloc.c (mark_object): Revert window marking code
since it's unsafe for the Fset_window_configuration.
2012-09-05 Paul Eggert <eggert@cs.ucla.edu>
Fix race conditions with signal handlers and errno.
...
...
src/alloc.c
View file @
0699fc18
...
...
@@ -6019,22 +6019,18 @@ mark_object (Lisp_Object arg)
case
PVEC_WINDOW
:
{
struct
window
*
w
=
(
struct
window
*
)
ptr
;
bool
leaf
=
NILP
(
w
->
hchild
)
&&
NILP
(
w
->
vchild
);
if
(
leaf
&&
NILP
(
w
->
buffer
))
/* If the window is deleted, mark just the window itself. */
VECTOR_MARK
(
ptr
);
else
/* Even if the window is deleted, we can't mark just the window
itself because set-window-configuration can resurrect it. */
mark_vectorlike
(
ptr
);
/* Mark glyphs for leaf windows. Marking window
matrices is sufficient because frame matrices
use the same glyph memory. */
if
(
NILP
(
w
->
hchild
)
&&
NILP
(
w
->
vchild
)
&&
w
->
current_matrix
)
{
mark_vectorlike
(
ptr
);
/* Mark glyphs for leaf windows. Marking window
matrices is sufficient because frame matrices
use the same glyph memory. */
if
(
leaf
&&
w
->
current_matrix
)
{
mark_glyph_matrix
(
w
->
current_matrix
);
mark_glyph_matrix
(
w
->
desired_matrix
);
}
mark_glyph_matrix
(
w
->
current_matrix
);
mark_glyph_matrix
(
w
->
desired_matrix
);
}
}
break
;
...
...
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