aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-06-02 19:53:02 +0300
committerEli Zaretskii2014-06-02 19:53:02 +0300
commit834dee2099cd30946753bd109f2f47d538575083 (patch)
tree92749d70301e0b61f5a9bf9dfaff3d704f43608a /src
parentbf0b7b55381e9a0ea57ed2ca5e865be20d20aed0 (diff)
downloademacs-834dee2099cd30946753bd109f2f47d538575083.tar.gz
emacs-834dee2099cd30946753bd109f2f47d538575083.zip
src/dispnew.c (update_frame_with_menu): Set display_completed.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/dispnew.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 07d2b5bd643..2e3b465e96e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-06-02 Eli Zaretskii <eliz@gnu.org>
2
3 * dispnew.c (update_frame_with_menu): Set display_completed.
4
12014-06-01 Paul Eggert <eggert@cs.ucla.edu> 52014-06-01 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * frame.c (x_set_frame_parameters): Don't read uninitialized storage. 7 * frame.c (x_set_frame_parameters): Don't read uninitialized storage.
diff --git a/src/dispnew.c b/src/dispnew.c
index 7833f8e8af5..1a9eefc5cfc 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3132,12 +3132,11 @@ update_frame_with_menu (struct frame *f)
3132 check_window_matrix_pointers (root_window); 3132 check_window_matrix_pointers (root_window);
3133#endif 3133#endif
3134 add_frame_display_history (f, paused_p); 3134 add_frame_display_history (f, paused_p);
3135#else
3136 IF_LINT ((void) paused_p);
3137#endif 3135#endif
3138 3136
3139 /* Reset flags indicating that a window should be updated. */ 3137 /* Reset flags indicating that a window should be updated. */
3140 set_window_update_flags (root_window, false); 3138 set_window_update_flags (root_window, false);
3139 display_completed = !paused_p;
3141} 3140}
3142 3141
3143 3142