[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104410: Tweak auto-mode-alist to han
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104410: Tweak auto-mode-alist to handle config.h.in (Bug#8547). |
Date: |
Sat, 28 May 2011 15:26:25 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104410
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-28 15:26:25 -0400
message:
Tweak auto-mode-alist to handle config.h.in (Bug#8547).
* lisp/files.el (auto-mode-alist): Move config rule after the
in-stripping one.
modified:
lisp/ChangeLog
lisp/files.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-28 19:13:00 +0000
+++ b/lisp/ChangeLog 2011-05-28 19:26:25 +0000
@@ -1,3 +1,8 @@
+2011-05-28 Chong Yidong <address@hidden>
+
+ * files.el (auto-mode-alist): Move config rule after the
+ in-stripping one (Bug#8547).
+
2011-05-28 Alp Aker <address@hidden> (tiny change)
* buff-menu.el (Buffer-menu-revert-function, Buffer-menu-sort):
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2011-05-27 19:33:48 +0000
+++ b/lisp/files.el 2011-05-28 19:26:25 +0000
@@ -2437,8 +2437,6 @@
("\\.ppd\\'" . conf-ppd-mode)
("java.+\\.conf\\'" . conf-javaprop-mode)
("\\.properties\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-javaprop-mode)
- ;; *.cf, *.cfg, *.conf, *.config[.local|.de_DE.UTF8|...], */config
- ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" .
conf-mode-maybe)
("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\(?:\\.d/.+\\)?\\|protocols\\|rpc\\|services\\)\\'"
. conf-space-mode)
("\\`/etc/\\(?:acpid?/.+\\|aliases\\(?:\\.d/.+\\)?\\|default/.+\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\|sysconfig/.+\\)\\'"
. conf-mode)
;; ChangeLog.old etc. Other change-log-mode entries are above;
@@ -2460,11 +2458,14 @@
;; Using mode nil rather than `ignore' would let the search continue
;; through this list (with the shortened name) rather than start over.
("\\.~?[0-9]+\\.[0-9][-.0-9]*~?\\'" nil t)
+ ("\\.\\(?:orig\\|in\\|[bB][aA][kK]\\)\\'" nil t)
+ ;; This should come after "in" stripping (e.g. config.h.in).
+ ;; *.cf, *.cfg, *.conf, *.config[.local|.de_DE.UTF8|...], */config
+ ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" .
conf-mode-maybe)
;; The following should come after the ChangeLog pattern
;; for the sake of ChangeLog.1, etc.
;; and after the .scm.[0-9] and CVS' <file>.<rev> patterns too.
- ("\\.[1-9]\\'" . nroff-mode)
- ("\\.\\(?:orig\\|in\\|[bB][aA][kK]\\)\\'" nil t)))
+ ("\\.[1-9]\\'" . nroff-mode)))
"Alist of filename patterns vs corresponding major mode functions.
Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL).
\(NON-NIL stands for anything that is not nil; the value does not matter.)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104410: Tweak auto-mode-alist to handle config.h.in (Bug#8547).,
Chong Yidong <=