From: Juri Linkov <juri@linkov.net>
Date: Mon, 28 Jan 2019 21:17:04 +0000 (+0200)
Subject: Small fixes
X-Git-Tag: emacs-27.0.90~3714
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=137b65a9b0a4118adda50f34375b4960701542e9;p=emacs.git

Small fixes

* lisp/generic-x.el (etc-passwd-generic-mode): Add comment.  (Bug#34225)

* lisp/vc/diff-mode.el (diff-syntax-fontify-hunk): Set overlay
property 'diff-mode to 'syntax.  (Bug#33567)
(diff-syntax-fontify-props): Reset buffer-file-name to nil.
---

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index dd614020153..47dfd2822d4 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1490,6 +1490,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
      '("^\\([^:]+\\):\\([^:]*\\):\\([0-9]+\\):\\(.*\\)$"
        (1 font-lock-type-face)
        (4 font-lock-variable-name-face))))
+  ;; /etc/passwd- is a backup file for /etc/passwd, so is group- and shadow-
   '("/etc/passwd-?\\'" "/etc/group-?\\'" "/etc/shadow-?\\'")
   (list
    (function
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 5d6cc6f38fb..158489c97fe 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2488,6 +2488,7 @@ When OLD is non-nil, highlight the hunk from the old source."
                   (let ((ol (make-overlay (+ bol (nth 0 prop))
                                           (+ bol (nth 1 prop))
                                           nil 'front-advance nil)))
+                    (overlay-put ol 'diff-mode 'syntax)
                     (overlay-put ol 'evaporate t)
                     (overlay-put ol 'face (nth 2 prop))))))))))))
 
@@ -2502,6 +2503,7 @@ hunk text is not found in the source file."
   (unless no-init
     (buffer-disable-undo)
     (font-lock-mode -1)
+    (setq buffer-file-name nil)
     (let ((enable-local-variables :safe) ;; to find `mode:'
           (buffer-file-name file))
       (set-auto-mode)