auto upstream

3 files changed, 25 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c510771264..cc30dc82341 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2013-01-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove some
+        checks made superfluous by the \_< operator.
+
+2013-01-27  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use "\\_<"
+        instead of "\\b".
+
+2013-01-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-handler): Notifications which result
+        from a saved file shall not be taken into account.  (Bug#13557)
+
 2013-01-26  Andreas Schwab  <schwab@linux-m68k.org>
 
         * emacs-lisp/lisp-mode.el (lisp-mode-variables): Add optional
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 25a953e1719..9270b98ac83 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -612,21 +612,16 @@ This is an internal function used by Auto-Revert Mode."
             (or (and buffer-file-name
                      (or auto-revert-remote-files
                          (not (file-remote-p buffer-file-name)))
+                     (or (not auto-revert-use-notify)
+                         auto-revert-notify-modified-p)
                      (if auto-revert-tail-mode
-                         (and (or (not auto-revert-use-notify)
-                                  auto-revert-notify-modified-p)
-                              (file-readable-p buffer-file-name)
+                         (and (file-readable-p buffer-file-name)
                               (/= auto-revert-tail-pos
                                   (setq size
                                         (nth 7 (file-attributes
                                                 buffer-file-name)))))
-                       ;; When `auto-revert-use-notify' is set, we do
-                       ;; not apply further checks for performance
-                       ;; reasons.
-                       (if auto-revert-use-notify
-                           auto-revert-notify-modified-p
-                         (and (file-readable-p buffer-file-name)
-                              (not (verify-visited-file-modtime buffer))))))
+                       (and (file-readable-p buffer-file-name)
+                            (not (verify-visited-file-modtime buffer)))))
                 (and (or auto-revert-mode
                          global-auto-revert-non-file-buffers)
                      revert-buffer-function
@@ -634,8 +629,8 @@ This is an internal function used by Auto-Revert Mode."
                      (functionp buffer-stale-function)
                      (funcall buffer-stale-function t))))
            eob eoblist)
+      (setq auto-revert-notify-modified-p nil)
       (when revert
-        (setq auto-revert-notify-modified-p nil)
         (when (and auto-revert-verbose
                    (not (eq revert 'fast)))
           (message "Reverting buffer `%s'." (buffer-name)))
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index a42a66dfa87..989c00365a0 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1552,7 +1552,7 @@ See `font-lock-syntax-table'.")
      1 font-lock-function-name-face)
    ;; keywords
    (cons (concat
-          "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|"
+          "\\(^\\|[^.@$]\\|\\.\\.\\)\\_<\\(defined\\?\\|"
           (regexp-opt
            '("alias_method"
              "alias"
@@ -1602,7 +1602,7 @@ See `font-lock-syntax-table'.")
    `(,ruby-here-doc-beg-re 0 (unless (ruby-singleton-class-p (match-beginning 0))
                                'font-lock-string-face))
    ;; variables
-   '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\>"
+   '("\\(^\\|[^.@$]\\|\\.\\.\\)\\_<\\(nil\\|self\\|true\\|false\\)\\>"
      2 font-lock-variable-name-face)
    ;; symbols
    '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|@?\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
@@ -1613,8 +1613,8 @@ See `font-lock-syntax-table'.")
    '("\\(\\$\\|@\\|@@\\)\\(\\w\\|_\\)+"
      0 font-lock-variable-name-face)
    ;; constants
-   '("\\(^\\|[^_]\\)\\b\\([A-Z]+\\(\\w\\|_\\)*\\)"
-     2 font-lock-type-face)
+   '("\\_<\\([A-Z]+\\(\\w\\|_\\)*\\)"
+     1 font-lock-type-face)
    '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face)
    ;; expression expansion
    '(ruby-match-expression-expansion