3 files changed, 25 insertions, 15 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