* files.el (inhibit-local-variables-regexps): Add .diff and .patch.

Fixes: debbugs:13862

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a19ebaf473f27fb8a9a57bc2a932306e25457e28..fb7883c03d462bc6a3e3819b3f1a3640aefe04bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-04  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (inhibit-local-variables-regexps):
+       Add .diff and .patch.  (Bug#13862)
+
 2013-03-03  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-adb.el (tramp-adb-maybe-open-connection): Cache,

diff --git a/lisp/files.el b/lisp/files.el
index cbc6e59c4420b0c1ddc5631b6dc78119c29698fc..9da9ac6fd5398a57f57ae29a97b46c26a9d08c81 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2498,6 +2498,7 @@ See also `auto-mode-alist'.")
                      "\\.zoo\\'" "\\.[jew]ar\\'" "\\.xpi\\'" "\\.rar\\'"
                      "\\.7z\\'"
                      "\\.sx[dmicw]\\'" "\\.odt\\'"
+                     "\\.diff\\'" "\\.patch\\'"
                      "\\.tiff?\\'" "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'"))
   "List of regexps matching file names in which to ignore local variables.
 This includes `-*-' lines as well as trailing \"Local Variables\" sections.