aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2019-05-22 10:18:51 -0700
committerGlenn Morris2019-05-22 10:18:51 -0700
commit5c21832ae866077874fb662e49c695a7850ec22c (patch)
tree2955309c3cbe881985426e6e1e41cb0d3d7a21ad /src
parentd99f0c6fb831da5cc5e4ca2661d660906f30625d (diff)
parentb0da9151d880f7ae60367a4b3d3ef91209bbd06f (diff)
downloademacs-5c21832ae866077874fb662e49c695a7850ec22c.tar.gz
emacs-5c21832ae866077874fb662e49c695a7850ec22c.zip
Merge from origin/emacs-26
b0da915 (origin/emacs-26, emacs-26) Fix a typo in ELisp manual 400907b Add option to disable help completion autoloading (Bug#28607) 122ba16 Don't segfault on force-window-update of deleted window 015b12e Fix typo in ELisp manual eadf044 Remove repeated function call in picture.el 1228a90 ; Fix mm-destroy-parts docstring typo 6cfd68d Fix Hideshow key binding typo in Emacs manual
Diffstat (limited to 'src')
-rw-r--r--src/window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c
index 30ffad0e513..ca7cf7a4a61 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4089,7 +4089,7 @@ displaying that buffer. */)
4089 return Qt; 4089 return Qt;
4090 } 4090 }
4091 4091
4092 if (WINDOWP (object)) 4092 if (WINDOW_LIVE_P (object))
4093 { 4093 {
4094 struct window *w = XWINDOW (object); 4094 struct window *w = XWINDOW (object);
4095 mark_window_display_accurate (object, false); 4095 mark_window_display_accurate (object, false);