aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-09-11 08:36:59 -0400
committerStefan Monnier2013-09-11 08:36:59 -0400
commitfeeff482d80b9f37d083497b2d3a9fec8bc58757 (patch)
treedcc61bbcb07d66079cec28444c2486602f6a9b5b
parent71b28baa2be2a084c45a75383eea7eb93ce79db1 (diff)
downloademacs-feeff482d80b9f37d083497b2d3a9fec8bc58757.tar.gz
emacs-feeff482d80b9f37d083497b2d3a9fec8bc58757.zip
* lisp/files.el (set-auto-mode): Simplify a bit further.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el8
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89610870f10..f5c4ee1b19e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * files.el (set-auto-mode): Simplify a bit further.
4
12013-09-11 Glenn Morris <rgm@gnu.org> 52013-09-11 Glenn Morris <rgm@gnu.org>
2 6
3 * files.el (interpreter-mode-alist): Remove \\` \\' parts. 7 * files.el (interpreter-mode-alist): Remove \\` \\' parts.
diff --git a/lisp/files.el b/lisp/files.el
index 5d8fbda6154..85bbc8596be 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2679,11 +2679,9 @@ we don't actually set it to the same mode the buffer already has."
2679 (setq done (assoc-default 2679 (setq done (assoc-default
2680 (file-name-nondirectory mode) 2680 (file-name-nondirectory mode)
2681 (mapcar (lambda (e) 2681 (mapcar (lambda (e)
2682 (if (string-match-p "\\`\\\\`" (car e)) 2682 (cons
2683 e 2683 (format "\\`%s\\'" (car e))
2684 (cons 2684 (cdr e)))
2685 (format "\\`%s\\'" (car e))
2686 (cdr e))))
2687 interpreter-mode-alist) 2685 interpreter-mode-alist)
2688 #'string-match-p)) 2686 #'string-match-p))
2689 ;; If we found an interpreter mode to use, invoke it now. 2687 ;; If we found an interpreter mode to use, invoke it now.