aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-11-18 13:41:03 +0200
committerEli Zaretskii2017-11-18 13:41:03 +0200
commit319c2de9dab577ea97f6c63cb8fd5b7ac3da82b0 (patch)
tree9cbb8e66a8f21217d259087d0c98e2af677a1e88 /src
parent63c773399e954eb027853557b0a20dbcc67b669e (diff)
downloademacs-319c2de9dab577ea97f6c63cb8fd5b7ac3da82b0.tar.gz
emacs-319c2de9dab577ea97f6c63cb8fd5b7ac3da82b0.zip
Avoid assertion violations in echo_area_display
* src/xdisp.c (echo_area_display): Don't try redisplaying the echo area if the selected-frame's mini-window is nil. (Bug#27647)
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 4c82737e410..02c5d76e06b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11510,6 +11510,9 @@ echo_area_display (bool update_frame_p)
11510 struct frame *sf = SELECTED_FRAME (); 11510 struct frame *sf = SELECTED_FRAME ();
11511 11511
11512 mini_window = FRAME_MINIBUF_WINDOW (sf); 11512 mini_window = FRAME_MINIBUF_WINDOW (sf);
11513 if (NILP (mini_window))
11514 return;
11515
11513 w = XWINDOW (mini_window); 11516 w = XWINDOW (mini_window);
11514 f = XFRAME (WINDOW_FRAME (w)); 11517 f = XFRAME (WINDOW_FRAME (w));
11515 11518