aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-02-12 20:56:46 +0000
committerRichard M. Stallman1996-02-12 20:56:46 +0000
commit15f0cf78163b3e59f4e325c7555ea988f668f06a (patch)
treebe0eba6760e6b269eb48df683c7c85b7739db22a /src
parentb4991b76126d8b908c8a2de2bcb794bb1a7175c3 (diff)
downloademacs-15f0cf78163b3e59f4e325c7555ea988f668f06a.tar.gz
emacs-15f0cf78163b3e59f4e325c7555ea988f668f06a.zip
(redisplay) [USE_X_TOOLKIT]: Do nothing if popup_activated.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index f96a1862f93..3430c98d211 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -818,6 +818,11 @@ redisplay ()
818 if (noninteractive) 818 if (noninteractive)
819 return; 819 return;
820 820
821#ifdef USE_X_TOOLKIT
822 if (popup_activated ())
823 return;
824#endif
825
821#ifdef MULTI_FRAME 826#ifdef MULTI_FRAME
822 if (FRAME_TERMCAP_P (selected_frame) 827 if (FRAME_TERMCAP_P (selected_frame)
823 && previous_terminal_frame != selected_frame) 828 && previous_terminal_frame != selected_frame)