aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1993-04-07 14:57:22 +0000
committerJim Blandy1993-04-07 14:57:22 +0000
commitd0386f2a50b5a663f3a59554861e37c6cb8c4be6 (patch)
treed741d4395fa0246b42828f7a36e447b3e98eb29c
parent5119b4121eb107253e848db189b0935525ee0824 (diff)
downloademacs-d0386f2a50b5a663f3a59554861e37c6cb8c4be6.tar.gz
emacs-d0386f2a50b5a663f3a59554861e37c6cb8c4be6.zip
* xterm.c (updating_frame): Declare this extern instead of static,
so it's the same variable as the updating_frame in term.c. (XTupdate_begin, XTupdate_end): Don't bother to set updating_frame; the term.c functions take care of that for us.
-rw-r--r--src/xterm.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/xterm.c b/src/xterm.c
index c84bd6ebd7f..e0eff77dfb6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -159,13 +159,12 @@ Display *x_current_display;
159/* The cursor to use for vertical scroll bars on x_current_display. */ 159/* The cursor to use for vertical scroll bars on x_current_display. */
160static Cursor x_vertical_scroll_bar_cursor; 160static Cursor x_vertical_scroll_bar_cursor;
161 161
162/* Frame being updated by update_frame. */ 162/* Frame being updated by update_frame. This is declared in term.c. */
163/* This is set by XTupdate_begin and looked at by all the 163 This is set by update_begin and looked at by all the
164 XT functions. It is zero while not inside an update. 164 XT functions. It is zero while not inside an update.
165 In that case, the XT functions assume that `selected_frame' 165 In that case, the XT functions assume that `selected_frame'
166 is the frame to apply to. */ 166 is the frame to apply to. */
167 167extern struct frame *updating_frame;
168static struct frame *updating_frame;
169 168
170/* The frame (if any) which has the X window that has keyboard focus. 169/* The frame (if any) which has the X window that has keyboard focus.
171 Zero if none. This is examined by Ffocus_frame in frame.c. Note 170 Zero if none. This is examined by Ffocus_frame in frame.c. Note
@@ -292,7 +291,6 @@ XTupdate_begin (f)
292 if (f == 0) 291 if (f == 0)
293 abort (); 292 abort ();
294 293
295 updating_frame = f;
296 flexlines = f->height; 294 flexlines = f->height;
297 highlight = 0; 295 highlight = 0;
298 296
@@ -325,7 +323,6 @@ XTupdate_end (f)
325 323
326 x_display_cursor (f, 1); 324 x_display_cursor (f, 1);
327 325
328 updating_frame = 0;
329 XFlushQueue (); 326 XFlushQueue ();
330 UNBLOCK_INPUT; 327 UNBLOCK_INPUT;
331} 328}