From: Daniel Pfeiffer <occitan@esperanto.org>
Date: Wed, 1 Dec 2004 09:47:18 +0000 (+0000)
Subject: acpid files under /etc
X-Git-Tag: ttn-vms-21-2-B4~3495
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9607552590f9b42cec2f0430a0b6d8ba973d694c;p=emacs.git

acpid files under /etc
---

diff --git a/lisp/files.el b/lisp/files.el
index 0a91cf2c248..1b269c0ddfa 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1767,7 +1767,7 @@ in that case, this function acts as if `enable-local-variables' were t."
      ;; *.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/\\(?:default/.*\\|aliases\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\)\\'" . conf-mode)
+     ("\\`/etc/\\(?:acpid?/.+\\|aliases\\|default/.+\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\)\\'" . 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