[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f85318c: Fix daemon crashes when linum-mode is turn
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master f85318c: Fix daemon crashes when linum-mode is turned on early on |
Date: |
Thu, 14 May 2015 15:49:34 +0000 |
branch: master
commit f85318cdcdc2f7cf7729117fcc841407776c7e4b
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix daemon crashes when linum-mode is turned on early on
* src/window.c (Fwindow_end): Don't try calling display engine
functions on initial-frame frame. (Bug#20565)
---
src/window.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/window.c b/src/window.c
index 0fcf82d..b828166 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1748,7 +1748,11 @@ if it isn't already recorded. */)
|| b->clip_changed
|| b->prevent_redisplay_optimizations_p
|| window_outdated (w))
- && !noninteractive)
+ /* Don't call display routines if we didn't yet create any real
+ frames, because the glyph matrices are not yet allocated in
+ that case. This could happen in some code that runs in the
+ daemon during initialization (e.g., see bug#20565). */
+ && !(noninteractive || FRAME_INITIAL_P (WINDOW_XFRAME (w))))
{
struct text_pos startp;
struct it it;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master f85318c: Fix daemon crashes when linum-mode is turned on early on,
Eli Zaretskii <=