*** empty log message ***

2 files changed, 26 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 552d4cf2f7c..808adc921af 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,12 +1,18 @@
+2000-03-14  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (x_term_init): Add support for X resource `synchronous'.
+        If set, call XSynchronize.
+
 2000-03-13  Stefan Monnier  <monnier@cs.yale.edu>
 
-        * regex.c: Declare a new type `re_char' used throughout the code for the
-        string char type.  It's `const unsigned char' to match the rest of Emacs.
-        Consistently make sure all pointers to strings use it and make sure all
-        pointers into the pattern use `unsigned char'.
+        * regex.c: Declare a new type `re_char' used throughout the code
+        for the string char type.  It's `const unsigned char' to match the
+        rest of Emacs.  Consistently make sure all pointers to strings use
+        it and make sure all pointers into the pattern use `unsigned
+        char'.
         (re_match_2_internal): Use `PREFETCH+STRING_CHAR' instead of
-        GET_CHAR_AFTER_2.
-        Also merge wordbound and notwordbound to reduce code duplication.
+        GET_CHAR_AFTER_2.  Also merge wordbound and notwordbound to reduce
+        code duplication.
 
         * charset.h (GET_CHAR_AFTER_2): Remove.
         (GET_CHAR_BEFORE_2): Use unsigned chars, like everywhere else.
diff --git a/src/xterm.c b/src/xterm.c
index b60912dd9db..e52e22e4bc1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13181,6 +13181,20 @@ x_term_init (display_name, xrm_option, resource_name)
 #endif
 #endif
 
+  /* See if we should run in synchronous mode.  This is useful
+     for debugging X code.  */
+  {
+    Lisp_Object value;
+    value = display_x_get_resource (dpyinfo,
+                                    build_string ("synchronous"),
+                                    build_string ("Synchronous"),
+                                    Qnil, Qnil);
+    if (STRINGP (value)
+        && (!strcmp (XSTRING (value)->data, "true")
+            || !strcmp (XSTRING (value)->data, "on")))
+      XSynchronize (dpyinfo->display, True);
+  }
+  
   UNBLOCK_INPUT;
 
   return dpyinfo;