* lisp/files.el (set-auto-mode): Simplify a bit further.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89610870f1061783b97e07b05a3de0fe4a1da871..f5c4ee1b19e071cd7368136808763bd1f7a50052 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * files.el (set-auto-mode): Simplify a bit further.
+
 2013-09-11  Glenn Morris  <rgm@gnu.org>
 
        * files.el (interpreter-mode-alist): Remove \\` \\' parts.

diff --git a/lisp/files.el b/lisp/files.el
index 5d8fbda61542226a8b8d3fec3ec29512277a0ede..85bbc8596beba3f47e977aa8cf942c98f2a6b4ef 100644 (file)
--- 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."
         (setq done (assoc-default
                     (file-name-nondirectory mode)
                     (mapcar (lambda (e)
-                              (if (string-match-p "\\`\\\\`" (car e))
-                                  e
-                                (cons
-                                 (format "\\`%s\\'" (car e))
-                                 (cdr e))))
+                               (cons
+                                (format "\\`%s\\'" (car e))
+                                (cdr e)))
                             interpreter-mode-alist)
                     #'string-match-p))
         ;; If we found an interpreter mode to use, invoke it now.