aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner LEMBERG2007-11-16 08:03:45 +0000
committerWerner LEMBERG2007-11-16 08:03:45 +0000
commitdddb4597e1ad9eed36ee9010ca81f55349a99643 (patch)
tree43680d86d0d20d374647d460a2976034268cae14
parent5fd98b2151b6a45d7c6c0df45f9b5aba4bca6f9f (diff)
downloademacs-dddb4597e1ad9eed36ee9010ca81f55349a99643.tar.gz
emacs-dddb4597e1ad9eed36ee9010ca81f55349a99643.zip
* files.el (set-auto-mode-1): Check second line for -*- if file
starts with '\" (which is used by man pages to identify needed troff preprocessors).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/files.el6
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c34a9f6090..e8fbe7eec5c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12007-11-16 Werner Lemberg <wl@gnu.org>
2
3 * files.el (set-auto-mode-1): Check second line for -*- if file
4 starts with '\" (which is used by man pages to identify needed
5 troff preprocessors).
6
12007-11-16 Glenn Morris <rgm@gnu.org> 72007-11-16 Glenn Morris <rgm@gnu.org>
2 8
3 * mail/mail-extr.el (mail-extr-all-top-level-domains): Update domains. 9 * mail/mail-extr.el (mail-extr-all-top-level-domains): Update domains.
diff --git a/lisp/files.el b/lisp/files.el
index a7dd79b8a88..d8c78a320ec 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2428,7 +2428,11 @@ Otherwise, return nil; point may be changed."
2428 ;; put them in the first line of 2428 ;; put them in the first line of
2429 ;; such a file without screwing up 2429 ;; such a file without screwing up
2430 ;; the interpreter invocation. 2430 ;; the interpreter invocation.
2431 (and (looking-at "^#!") 2)) t) 2431 ;; The same holds for
2432 ;; '\"
2433 ;; in man pages (preprocessor
2434 ;; magic for the `man' program).
2435 (and (looking-at "^\\(#!\\|'\\\\\"\\)") 2)) t)
2432 (progn 2436 (progn
2433 (skip-chars-forward " \t") 2437 (skip-chars-forward " \t")
2434 (setq beg (point)) 2438 (setq beg (point))