(inhibit_try_window_id, inhibit_try_window_reusing)

(inhibit_try_cursor_movement) [GLYPH_DEBUG]: New variables.
(try_window_id, try_window_reusing_current_matrix)
(try_cursor_movement) [GLYPH_DEBUG]: Don't run if inhibited.
(syms_of_xdisp) [GLYPH_DEBUG]:  DEFVAR_BOOL the variables.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8dc11ef44654091c749fb33903c97ad19fdb8ba3..a0fe0f40e064b3f976fb82fd79e374525ab9c1db 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-24  Gerd Moellmann  <gerd@gnu.org>
+
+       * xdisp.c (inhibit_try_window_id, inhibit_try_window_reusing)
+       (inhibit_try_cursor_movement) [GLYPH_DEBUG]: New variables.
+       (try_window_id, try_window_reusing_current_matrix)
+       (try_cursor_movement) [GLYPH_DEBUG]: Don't run if inhibited.
+       (syms_of_xdisp) [GLYPH_DEBUG]:  DEFVAR_BOOL the variables.
+
 2001-10-23  Gerd Moellmann  <gerd@gnu.org>
 
        * dispnew.c (sync_window_with_frame_matrix_rows): Fix 

diff --git a/src/xdisp.c b/src/xdisp.c
index b2a36c9b498c67ecd1fac1d04002df4fcbbab09a..55ecdca0e19cad5c013e334f6913a1bf7f703c01 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -552,6 +552,11 @@ int current_mode_line_height, current_header_line_height;
 
 #if GLYPH_DEBUG
 
+/* Variables to turn off display optimizations from Lisp.  */
+
+int inhibit_try_window_id, inhibit_try_window_reusing;
+int inhibit_try_cursor_movement;
+
 /* Non-zero means print traces of redisplay if compiled with
    GLYPH_DEBUG != 0.  */
 
@@ -9686,6 +9691,11 @@ try_cursor_movement (window, startp, scroll_step)
   struct frame *f = XFRAME (w->frame);
   int rc = CURSOR_MOVEMENT_CANNOT_BE_USED;
   
+#ifdef GLYPH_DEBUG
+  if (inhibit_try_cursor_movement)
+    return rc;
+#endif
+
   /* Handle case where text has not changed, only point, and it has
      not moved off the frame.  */
   if (/* Point may be in this window.  */
@@ -10622,6 +10632,11 @@ try_window_reusing_current_matrix (w)
   struct glyph_row *start_row;
   int start_vpos, min_y, max_y;
 
+#ifdef GLYPH_DEBUG
+  if (inhibit_try_window_reusing)
+    return 0;
+#endif
+
   if (/* This function doesn't handle terminal frames.  */
       !FRAME_WINDOW_P (f)
       /* Don't try to reuse the display if windows have been split
@@ -11288,6 +11303,11 @@ try_window_id (w)
   struct text_pos start;
   int first_changed_charpos, last_changed_charpos;
 
+#ifdef GLYPH_DEBUG
+  if (inhibit_try_window_id)
+    return 0;
+#endif
+
   /* This is handy for debugging.  */
 #if 0
 #define GIVE_UP(X)                                             \
@@ -14940,6 +14960,20 @@ Can be used to update submenus whose contents should vary.");
   DEFVAR_BOOL ("inhibit-eval-during-redisplay", &inhibit_eval_during_redisplay,
     "Non-nil means don't eval Lisp during redisplay.");
   inhibit_eval_during_redisplay = 0;
+
+#ifdef GLYPH_DEBUG
+  DEFVAR_BOOL ("inhibit-try-window-id", &inhibit_try_window_id,
+              "Inhibit try_window_id display optimization.");
+  inhibit_try_window_id = 0;
+
+  DEFVAR_BOOL ("inhibit-try-window-reusing", &inhibit_try_window_reusing,
+              "Inhibit try_window_reusing display optimization.");
+  inhibit_try_window_reusing = 0;
+
+  DEFVAR_BOOL ("inhibit-try-cursor-movement", &inhibit_try_cursor_movement,
+              "Inhibit try_cursor_movement display optimization.");
+  inhibit_try_cursor_movement = 0;
+#endif /* GLYPH_DEBUG */
 }