* lisp/vc/diff-mode.el (diff-font-lock-keywords): Add more Git headers.

* lisp/gnus/mm-view.el (mm-display-inline-fontify): Set mode to
the selected major-mode, so diff-mode could be detected afterwards.

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index b0d88d89843ad7b900cc27e570b086f6995c9fdc..8ce094349f2ad4a8d092f11bca1157375bf9e9e3 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -493,7 +493,8 @@ If MODE is not set, try to find mode automatically."
            (let ((auto-mode-alist
                   (delq (rassq 'doc-view-mode-maybe auto-mode-alist)
                         (copy-sequence auto-mode-alist))))
-             (set-auto-mode)))
+             (set-auto-mode)
+             (setq mode major-mode)))
          ;; The mode function might have already turned on font-lock.
          ;; Do not fontify if the guess mode is fundamental.
          (unless (or font-lock-mode

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index bad56391c6bf92ec43148617a580945b1fa6e7bb..b22a58889846fdcd32eba92d6ad0e3475e2808ba 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -436,6 +436,7 @@ and the face `diff-added' for added lines.")
     ("^\\(?:Index\\|revno\\): \\(.+\\).*\n"
      (0 'diff-header) (1 'diff-index prepend))
     ("^\\(?:index .*\\.\\.\\|diff \\).*\n" . 'diff-header)
+    ("^\\(?:new\\|deleted\\) file mode .*\n" . 'diff-header)
     ("^Only in .*\n" . 'diff-nonexistent)
     ("^Binary files .* differ\n" . 'diff-file-header)
     ("^\\(#\\)\\(.*\\)"