auto upstream

3 files changed, 18 insertions, 76 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e147889f796..abbe4ed6dd4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2013-01-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (opendir): Now accepts a 'const char *'.
+
+2013-01-28  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Remove obsolete redisplay code.  See the discussion at
+        http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00576.html.
+        * dispnew.c (preemption_period, preemption_next_check): Remove.
+        (Vredisplay_preemption_period): Likewise.
+        (update_frame, update_single_window, update_window, update_frame_1):
+        Adjust users.  Always assume that PERIODIC_PREEMPTION_CHECKING is not
+        used, following the 2012-06-22 change.
+
 2013-01-25  Eli Zaretskii  <eliz@gnu.org>
 
         * w32notify.c (Fw32notify_add_watch): Doc fix.  (Bug#13540)
diff --git a/src/dispnew.c b/src/dispnew.c
index a680ca0e03a..0037c0269de 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -110,12 +110,6 @@ static void set_window_cursor_after_update (struct window *);
 static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
 static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
 
-
-/* Redisplay preemption timers.  */
-
-static EMACS_TIME preemption_period;
-static EMACS_TIME preemption_next_check;
-
 /* True upon entry to redisplay means do not assume anything about
    current contents of actual terminal frame; clear and redraw it.  */
 
@@ -3082,21 +3076,10 @@ update_frame (struct frame *f, bool force_p, bool inhibit_hairy_id_p)
 
   if (redisplay_dont_pause)
     force_p = 1;
-  else if (NILP (Vredisplay_preemption_period))
-    force_p = 1;
-  else if (!force_p && NUMBERP (Vredisplay_preemption_period))
+  else if (!force_p && detect_input_pending_ignore_squeezables ())
     {
-      double p = XFLOATINT (Vredisplay_preemption_period);
-
-      if (detect_input_pending_ignore_squeezables ())
-        {
-          paused_p = 1;
-          goto do_pause;
-        }
-
-      preemption_period = EMACS_TIME_FROM_DOUBLE (p);
-      preemption_next_check = add_emacs_time (current_emacs_time (),
-                                              preemption_period);
+      paused_p = 1;
+      goto do_pause;
     }
 
   if (FRAME_WINDOW_P (f))
@@ -3234,15 +3217,6 @@ update_single_window (struct window *w, bool force_p)
 
       if (redisplay_dont_pause)
         force_p = 1;
-      else if (NILP (Vredisplay_preemption_period))
-        force_p = 1;
-      else if (!force_p && NUMBERP (Vredisplay_preemption_period))
-        {
-          double p = XFLOATINT (Vredisplay_preemption_period);
-          preemption_period = EMACS_TIME_FROM_DOUBLE (p);
-          preemption_next_check = add_emacs_time (current_emacs_time (),
-                                                  preemption_period);
-        }
 
       /* Update W.  */
       update_begin (f);
@@ -3396,9 +3370,7 @@ update_window (struct window *w, bool force_p)
 {
   struct glyph_matrix *desired_matrix = w->desired_matrix;
   bool paused_p;
-#if !PERIODIC_PREEMPTION_CHECKING
   int preempt_count = baud_rate / 2400 + 1;
-#endif
   struct redisplay_interface *rif = FRAME_RIF (XFRAME (WINDOW_FRAME (w)));
 #ifdef GLYPH_DEBUG
   /* Check that W's frame doesn't have glyph matrices.  */
@@ -3406,10 +3378,8 @@ update_window (struct window *w, bool force_p)
 #endif
 
   /* Check pending input the first time so that we can quickly return.  */
-#if !PERIODIC_PREEMPTION_CHECKING
   if (!force_p)
     detect_input_pending_ignore_squeezables ();
-#endif
 
   /* If forced to complete the update, or if no input is pending, do
      the update.  */
@@ -3420,9 +3390,7 @@ update_window (struct window *w, bool force_p)
       struct glyph_row *header_line_row;
       int yb;
       bool changed_p = 0, mouse_face_overwritten_p = 0;
-#if ! PERIODIC_PREEMPTION_CHECKING
       int n_updated = 0;
-#endif
 
       rif->update_window_begin_hook (w);
       yb = window_text_bottom_y (w);
@@ -3486,22 +3454,8 @@ update_window (struct window *w, bool force_p)
                detect_input_pending.  If it's done too often,
                scrolling large windows with repeated scroll-up
                commands will too quickly pause redisplay.  */
-#if PERIODIC_PREEMPTION_CHECKING
-            if (!force_p)
-              {
-                EMACS_TIME tm = current_emacs_time ();
-                if (EMACS_TIME_LT (preemption_next_check, tm))
-                  {
-                    preemption_next_check = add_emacs_time (tm,
-                                                            preemption_period);
-                    if (detect_input_pending_ignore_squeezables ())
-                      break;
-                  }
-              }
-#else
             if (!force_p && ++n_updated % preempt_count == 0)
               detect_input_pending_ignore_squeezables ();
-#endif
             changed_p |= update_window_line (w, vpos,
                                              &mouse_face_overwritten_p);
 
@@ -4542,13 +4496,11 @@ update_frame_1 (struct frame *f, bool force_p, bool inhibit_id_p)
   if (preempt_count <= 0)
     preempt_count = 1;
 
-#if !PERIODIC_PREEMPTION_CHECKING
   if (!force_p && detect_input_pending_ignore_squeezables ())
     {
       pause_p = 1;
       goto do_pause;
     }
-#endif
 
   /* If we cannot insert/delete lines, it's no use trying it.  */
   if (!FRAME_LINE_INS_DEL_OK (f))
@@ -4589,21 +4541,8 @@ update_frame_1 (struct frame *f, bool force_p, bool inhibit_id_p)
                 }
             }
 
-#if PERIODIC_PREEMPTION_CHECKING
-          if (!force_p)
-            {
-              EMACS_TIME tm = current_emacs_time ();
-              if (EMACS_TIME_LT (preemption_next_check, tm))
-                {
-                  preemption_next_check = add_emacs_time (tm, preemption_period);
-                  if (detect_input_pending_ignore_squeezables ())
-                    break;
-                }
-            }
-#else
           if (!force_p && (i - 1) % preempt_count == 0)
             detect_input_pending_ignore_squeezables ();
-#endif
 
           update_frame_line (f, i);
         }
@@ -4709,9 +4648,7 @@ update_frame_1 (struct frame *f, bool force_p, bool inhibit_id_p)
         }
     }
 
-#if !PERIODIC_PREEMPTION_CHECKING
  do_pause:
-#endif
 
   clear_desired_matrices (f);
   return pause_p;
@@ -6421,15 +6358,6 @@ See `buffer-display-table' for more information.  */);
                doc: /* Non-nil means display update isn't paused when input is detected.  */);
   redisplay_dont_pause = 1;
 
-#if PERIODIC_PREEMPTION_CHECKING
-  DEFVAR_LISP ("redisplay-preemption-period", Vredisplay_preemption_period,
-               doc: /* Period in seconds between checking for input during redisplay.
-This has an effect only if `redisplay-dont-pause' is nil; in that
-case, arriving input preempts redisplay until the input is processed.
-If the value is nil, redisplay is never preempted.  */);
-  Vredisplay_preemption_period = make_float (0.10);
-#endif
-
 #ifdef CANNOT_DUMP
   if (noninteractive)
 #endif
diff --git a/src/w32.c b/src/w32.c
index f722bc5f397..6bcc8e19278 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2809,7 +2809,7 @@ static char  *read_unc_volume (HANDLE, char *, int);
 static void   close_unc_volume (HANDLE);
 
 DIR *
-opendir (char *filename)
+opendir (const char *filename)
 {
   DIR *dirp;