From: Glenn Morris <rgm@gnu.org>
Date: Mon, 4 Mar 2013 07:37:30 +0000 (-0800)
Subject: * files.el (inhibit-local-variables-regexps): Add .diff and .patch.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~635
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb05411f529074a74395a0925e4cff6d8f0ec763;p=emacs.git

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

Fixes: debbugs:13862
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a19ebaf473f..fb7883c03d4 100644
--- 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 cbc6e59c442..9da9ac6fd53 100644
--- 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.