Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

4 files changed, 42 insertions, 36 deletions

diff --git a/lisp/ffap.el b/lisp/ffap.el
index d4e30a05dcc..452275ab8c2 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1004,7 +1004,7 @@ If a given RFC isn't in these then `ffap-rfc-path' is offered."
     ;; Slightly controversial decisions:
     ;; * strip trailing "@" and ":"
     ;; * no commas (good for latex)
-    (file "--:\\\\$+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
+    (file "--:\\\\$\\{\\}+<>@-Z_[:alpha:]~*?" "<@" "@>;.,!:")
     ;; An url, or maybe a email/news message-id:
     (url "--:=&?$+@-Z_[:alpha:]~#,%;*()!'" "^[0-9a-zA-Z]" ":;.,!?")
     ;; Find a string that does *not* contain a colon:
diff --git a/lisp/files.el b/lisp/files.el
index 0fdf0048ac4..eca52e0ddd3 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3931,17 +3931,19 @@ the old visited file has been renamed to the new name FILENAME."
            (make-local-variable 'backup-inhibited)
            (setq backup-inhibited t)))
     (let ((oauto buffer-auto-save-file-name))
-      ;; If auto-save was not already on, turn it on if appropriate.
-      (if (not buffer-auto-save-file-name)
-          (and buffer-file-name auto-save-default
-               (auto-save-mode t))
-        ;; If auto save is on, start using a new name.
-        ;; We deliberately don't rename or delete the old auto save
-        ;; for the old visited file name.  This is because perhaps
-        ;; the user wants to save the new state and then compare with the
-        ;; previous state from the auto save file.
-        (setq buffer-auto-save-file-name
-              (make-auto-save-file-name)))
+      (cond ((null filename)
+             (setq buffer-auto-save-file-name nil))
+            ((not buffer-auto-save-file-name)
+             ;; If auto-save was not already on, turn it on if appropriate.
+             (and buffer-file-name auto-save-default (auto-save-mode t)))
+            (t
+             ;; If auto save is on, start using a new name. We
+             ;; deliberately don't rename or delete the old auto save
+             ;; for the old visited file name.  This is because
+             ;; perhaps the user wants to save the new state and then
+             ;; compare with the previous state from the auto save
+             ;; file.
+             (setq buffer-auto-save-file-name (make-auto-save-file-name))))
       ;; Rename the old auto save file if any.
       (and oauto buffer-auto-save-file-name
            (file-exists-p oauto)
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 65969113d93..157b04d8a9e 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -92,9 +92,12 @@ Isearch starts.")
 The value is nil when the search still is in the initial buffer.")
 
 ;;;###autoload
-(defvar multi-isearch-buffer-list nil)
+(defvar multi-isearch-buffer-list nil
+  "Sequence of buffers visited by multiple buffers Isearch.
+This is nil if Isearch is not currently searching more than one buffer.")
 ;;;###autoload
-(defvar multi-isearch-file-list nil)
+(defvar multi-isearch-file-list nil
+  "Sequence of files visited by multiple file buffers Isearch.")
 
 (defvar multi-isearch-orig-search-fun nil)
 (defvar multi-isearch-orig-wrap nil)
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 9a1273ddcce..44172b05a56 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -539,28 +539,29 @@ stuff.  Used on level 1 and higher."
                   (let* ((re (c-make-keywords-re nil
                                (c-lang-const c-cpp-include-directives)))
                          (re-depth (regexp-opt-depth re)))
-                    `((,(concat noncontinued-line-end
-                                (c-lang-const c-opt-cpp-prefix)
-                                re
-                                (c-lang-const c-syntactic-ws)
-                                "\\(<[^>\n\r]*>?\\)")
-                       (,(+ ncle-depth re-depth sws-depth 1)
-                        font-lock-string-face)
-
-                       ;; Use an anchored matcher to put paren syntax
-                       ;; on the brackets.
-                       (,(byte-compile
-                          `(lambda (limit)
-                             (let ((beg (match-beginning
-                                         ,(+ ncle-depth re-depth sws-depth 1)))
-                                   (end (1- (match-end ,(+ ncle-depth re-depth
-                                                           sws-depth 1)))))
-                               (if (eq (char-after end) ?>)
-                                   (progn
-                                     (c-mark-<-as-paren beg)
-                                     (c-mark->-as-paren end))
-                                 (c-unmark-<->-as-paren beg)))
-                             nil)))))))
+                    ;; We used to use a font-lock "anchored matcher" here for
+                    ;; the paren syntax.  This failed when the ">" was at EOL,
+                    ;; since `font-lock-fontify-anchored-keywords' terminated
+                    ;; its loop at EOL without executing our lambda form at
+                    ;; all.
+                    `((,(c-make-font-lock-search-function
+                         (concat noncontinued-line-end
+                                 (c-lang-const c-opt-cpp-prefix)
+                                 re
+                                 (c-lang-const c-syntactic-ws)
+                                 "\\(<[^>\n\r]*>?\\)")
+                         `(,(+ ncle-depth re-depth sws-depth 1)
+                           font-lock-string-face t)
+                         `((let ((beg (match-beginning
+                                       ,(+ ncle-depth re-depth sws-depth 1)))
+                                 (end (1- (match-end ,(+ ncle-depth re-depth
+                                                         sws-depth 1)))))
+                             (if (eq (char-after end) ?>)
+                                 (progn
+                                   (c-mark-<-as-paren beg)
+                                   (c-mark->-as-paren end))
+                               (c-unmark-<->-as-paren beg)))
+                           nil))))))
 
               ;; #define.
               ,@(when (c-lang-const c-opt-cpp-macro-define)