10 files changed, 56 insertions, 95 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc30dc82341..01fb7223226 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,16 @@
+2013-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol
+        (bug#13297).
+
 2013-01-27  Dmitry Gutov  <dgutov@yandex.ru>
 
         * progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove some
         checks made superfluous by the \_< operator.
+        * progmodes/ruby-mode.el (ruby-move-to-block): Work with (maybe
+        temporarily) broken indentation.
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords):
+        Highlight nested constants, too.  \_< broke that.
 
 2013-01-27  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -113,8 +122,8 @@
 
 2013-01-22  Michael Albinus  <michael.albinus@gmx.de>
 
-        * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers): Mark
-        descriptive parts with `display' property.
+        * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers):
+        Mark descriptive parts with `display' property.
 
 2013-01-21  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
@@ -143,13 +152,13 @@
 
         * net/tramp-adb.el (top): Require `time-date'.
         (tramp-adb-ls-output-time-less-p): Use `tramp-time-less-p'.
-        (tramp-adb-handle-copy-file, tramp-adb-handle-rename-file): Use
-        `tramp-file-name-handler'.
-        (tramp-adb-maybe-open-connection): Use
-        `tramp-compat-set-process-query-on-exit-flag'.
+        (tramp-adb-handle-copy-file, tramp-adb-handle-rename-file):
+        Use `tramp-file-name-handler'.
+        (tramp-adb-maybe-open-connection):
+        Use `tramp-compat-set-process-query-on-exit-flag'.
 
-        * net/tramp-sh.el (tramp-sh-handle-file-acl): Use
-        `tramp-compat-funcall'.
+        * net/tramp-sh.el (tramp-sh-handle-file-acl):
+        Use `tramp-compat-funcall'.
 
         * net/tramp-smb.el (tramp-smb-handle-file-acl): Use `looking-at' and
         `tramp-compat-funcall'.
@@ -189,8 +198,8 @@
 2013-01-19  Christian Wittern  <cwittern@gmail.com>  (tiny change)
             Chong Yidong  <cyd@gnu.org>
 
-        * image-mode.el (image-next-file, image-previous-file): New
-        commands (Bug#8453).
+        * image-mode.el (image-next-file, image-previous-file):
+        New commands (Bug#8453).
         (image-mode-map): Bind them to n and p.
         (image-mode--images-in-directory): New helper function.
 
@@ -218,8 +227,8 @@
 
         * autorevert.el (auto-revert-use-notify): In the :set function, do
         not modify `kill-buffer-hook'.
-        (auto-revert-notify-rm-watch): Remove
-        `auto-revert-notify-rm-watch' from `kill-buffer-hook'.
+        (auto-revert-notify-rm-watch):
+        Remove `auto-revert-notify-rm-watch' from `kill-buffer-hook'.
         (auto-revert-notify-add-watch): Do not call
         `auto-revert-notify-rm-watch', but add it to a buffer local
         `kill-buffer-hook'.
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index e7948614241..cbd8ac5ebad 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -562,7 +562,8 @@ then remove all hi-lock highlighting."
     (when keyword
       (let ((face (hi-lock-keyword->face keyword)))
         ;; Make `face' the next one to use by default.
-        (add-to-list 'hi-lock--unused-faces (face-name face)))
+        (when (symbolp face)          ;Don't add it if it's a list (bug#13297).
+          (add-to-list 'hi-lock--unused-faces (face-name face))))
       (font-lock-remove-keywords nil (list keyword))
       (setq hi-lock-interactive-patterns
             (delq keyword hi-lock-interactive-patterns))
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 989c00365a0..19d1ffe0a3b 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -905,7 +905,7 @@ current block, a sibling block, or an outer block.  Do that (abs N) times."
          ((and backward (looking-at "^=end\\>"))
           (re-search-backward "^=begin\\>"))
          (t
-          (setq pos (current-indentation))
+          (setq pos (ruby-calculate-indent))
           (cond
            ;; Deeper indentation, we found a block.
            ;; FIXME: We can't recognize empty blocks this way.
@@ -1613,7 +1613,7 @@ See `font-lock-syntax-table'.")
    '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+"
      0 font-lock-variable-name-face)
    ;; constants
-   '("\\_<\\([A-Z]+\\(\\w\\|_\\)*\\)"
+   '("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)"
      1 font-lock-type-face)
    '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face)
    ;; expression expansion
diff --git a/nt/ChangeLog b/nt/ChangeLog
index aca1236657b..8b8628db1e2 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/dirent.h (opendir): Update prototype.
+
 2013-01-11  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/unistd.h (O_IGNORE_CTTY): Define, as it is unconditionally
diff --git a/nt/inc/dirent.h b/nt/inc/dirent.h
index 618f3beddf0..676b82d207b 100644
--- a/nt/inc/dirent.h
+++ b/nt/inc/dirent.h
@@ -30,7 +30,7 @@ typedef struct
         char    dd_buf[DIRBLKSIZ];      /* directory block */
         }       DIR;                    /* stream data from opendir() */
 
-extern DIR              *opendir (char *);
+extern DIR              *opendir (const char *);
 extern struct dirent    *readdir (DIR *);
 extern void             seekdir (DIR *, long);
 extern void             closedir (DIR *);
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;
 
diff --git a/test/ChangeLog b/test/ChangeLog
index 505ac398e2f..7e893ba6768 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -2,6 +2,10 @@
 
         * automated/ruby-mode-tests.el
         (ruby-indent-spread-args-in-parens): New test.
+        * automated/ruby-mode-tests.el (ruby-block-test-example):
+        Break indentation of the do block opener and add a line inside it.
+        * automated/ruby-mode-tests.el (works-on-do, ok-with-three):
+        Adjust line numbers.
 
 2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index 42c59a1f3f0..2028c6fad00 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -408,7 +408,8 @@ VALUES-PLIST is a list with alternating index and value elements."
    |  end
    |
    |  def baz
-   |    some do
+   |some do
+   |3
    |    end
    |  end
    |end"))
@@ -425,7 +426,7 @@ VALUES-PLIST is a list with alternating index and value elements."
 (ruby-deftest-move-to-block works-on-do
   (goto-line 11)
   (ruby-end-of-block)
-  (should (= 12 (line-number-at-pos)))
+  (should (= 13 (line-number-at-pos)))
   (ruby-beginning-of-block)
   (should (= 11 (line-number-at-pos))))
 
@@ -437,7 +438,7 @@ VALUES-PLIST is a list with alternating index and value elements."
 (ruby-deftest-move-to-block ok-with-three
   (goto-line 2)
   (ruby-move-to-block 3)
-  (should (= 13 (line-number-at-pos))))
+  (should (= 14 (line-number-at-pos))))
 
 (ruby-deftest-move-to-block ok-with-minus-two
   (goto-line 10)