emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/gnus-cloud 513812e 52/61: Merge branch 'master' of


From: Teodor Zlatanov
Subject: [Emacs-diffs] scratch/gnus-cloud 513812e 52/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Fri, 1 Jul 2016 17:37:56 +0000 (UTC)

branch: scratch/gnus-cloud
commit 513812e6ee3339bc44cce299e5b1262dad1d78d9
Merge: de3eb76 ff64fa7
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/textmodes/tex-mode.el |    2 +-
 lisp/vc/log-view.el        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index bc5e516..710899f 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -505,7 +505,7 @@ An alternative value is \" . \", if you use a font with a 
narrow period."
                   (funcall inbraces-re
                            (concat "{" (funcall inbraces-re "{[^}]*}") "*}"))
                   "*}\\)+\\$?\\$")
-         (0 tex-math))
+         (0 'tex-math))
         ;; Heading args.
         (,(concat slash headings "\\*?" opt arg)
          ;; If ARG ends up matching too much (if the {} don't match, e.g.)
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index c77770b..44b8e0b 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -241,8 +241,8 @@ The match group number 1 should match the revision number 
itself.")
   ;; and log-view-message-re, if applicable.
   '((eval . `(,log-view-file-re
               (1 (if (boundp 'cvs-filename-face) cvs-filename-face))
-              (0 log-view-file append)))
-    (eval . `(,log-view-message-re . log-view-message))))
+              (0 'log-view-file append)))
+    (eval . `(,log-view-message-re . 'log-view-message))))
 
 (defconst log-view-font-lock-defaults
   '(log-view-font-lock-keywords t nil nil nil))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]