(auto-mode-alist): Handle /etc/sysconfig/*,

/etc/permissions.d/* and /etc/aliases.d/*.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b8364d3c2cb5dfd4e6702adaa78eb35c86446e5..a55421da600078a4043f1e0a7be116e72071ac6b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-16  Andreas Schwab  <schwab@suse.de>
+
+       * files.el (auto-mode-alist): Handle /etc/sysconfig/*,
+       /etc/permissions.d/* and /etc/aliases.d/*.
+
 2005-04-16  Kenichi Handa  <handa@m17n.org>
 
        * international/code-pages.el (cp-make-coding-system): Set

diff --git a/lisp/files.el b/lisp/files.el
index d5e98672d27a50d348fde2e14fe94ab0d57800ef..407922082f1b50aebfbc3c1527b62c169781457f 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1844,8 +1844,8 @@ in that case, this function acts as if `enable-local-variables' were t."
      ("\\.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)
-     ("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\|protocols\\|rpc\\|services\\)\\'" . conf-space-mode)
-     ("\\`/etc/\\(?:acpid?/.+\\|aliases\\|default/.+\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\)\\'" . conf-mode)
+     ("\\`/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)
      ;; either user's dot-files or under /etc or some such
      ("/\\.?\\(?:gnokiirc\\|kde.*rc\\|mime\\.types\\|wgetrc\\)\\'" . conf-mode)
      ;; alas not all ~/.*rc files are like this