[Emacs-diffs] trunk r114097: * xterm.c (toplevel): Drop obsolete comment and move compose_status...

[Dmitry Antipov]

------------------------------------------------------------
revno: 114097
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-02 09:59:35 +0400
message:
  * xterm.c (toplevel): Drop obsolete comment and move compose_status...
  (handle_one_xevent): ...to here.
  (STORE_KEYSYM_FOR_DEBUG): Move under ENABLE_CHECKING and make no-op
  otherwise.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-02 03:39:06 +0000
+++ b/src/ChangeLog     2013-09-02 05:59:35 +0000
@@ -1,5 +1,12 @@
 2013-09-02  Dmitry Antipov  <address@hidden>
 
+       * xterm.c (toplevel): Drop obsolete comment and move compose_status...
+       (handle_one_xevent): ...to here.
+       (STORE_KEYSYM_FOR_DEBUG): Move under ENABLE_CHECKING and make no-op
+       otherwise.
+
+2013-09-02  Dmitry Antipov  <address@hidden>
+
        * msdos.c (IT_set_terminal_window): Remove no-op.
        (initialize_msdos_display): Adjust terminal setup.
        * w32console.c (w32con_set_terminal_window): Remove no-op.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-09-02 03:39:06 +0000
+++ b/src/xterm.c       2013-09-02 05:59:35 +0000
@@ -5622,18 +5622,7 @@
 #endif /* not USE_TOOLKIT_SCROLL_BARS */
 }
 
-
-/* The main X event-reading loop - XTread_socket.  */
-
-/* This holds the state XLookupString needs to implement dead keys
-   and other tricks known as "compose processing".  _X Window System_
-   says that a portable program can't use this, but Stephen Gildea assures
-   me that letting the compiler initialize it to zeros will work okay.
-
-   This must be defined outside of XTread_socket, for the same reasons
-   given for enter_timestamp, above.  */
-
-static XComposeStatus compose_status;
+#ifdef ENABLE_CHECKING
 
 /* Record the last 100 characters stored
    to help debug the loss-of-chars-during-GC problem.  */
@@ -5646,6 +5635,12 @@
     temp_index = 0;                                            \
   temp_buffer[temp_index++] = (keysym)
 
+#else /* not ENABLE_CHECKING */
+
+#define STORE_KEYSYM_FOR_DEBUG(keysym) ((void)0)
+
+#endif /* ENABLE_CHECKING */
+
 /* Set this to nonzero to fake an "X I/O error"
    on a particular display.  */
 
@@ -5783,6 +5778,12 @@
   struct coding_system coding;
   XEvent event = *eventptr;
   Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
+  /* This holds the state XLookupString needs to implement dead keys
+     and other tricks known as "compose processing".  _X Window System_
+     says that a portable program can't use this, but Stephen Gildea assures
+     me that letting the compiler initialize it to zeros will work okay.  */
+  static XComposeStatus compose_status;
+
   USE_SAFE_ALLOCA;
 
   *finish = X_EVENT_NORMAL;