diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-03-03 23:37:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-03-03 23:37:30 -0800 |
| commit | cb05411f529074a74395a0925e4cff6d8f0ec763 (patch) | |
| tree | af3481a3db342a8a906e3d0f4686db73602f194e /lisp | |
| parent | f5572543da4d20babb11309a8972aa185d62c6b6 (diff) | |
| download | emacs-cb05411f529074a74395a0925e4cff6d8f0ec763.tar.gz | |
* files.el (inhibit-local-variables-regexps): Add .diff and .patch.
Fixes: debbugs:13862
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 1 |
2 files changed, 6 insertions, 0 deletions
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. |