From: Daniel Pfeiffer Date: Sun, 14 Nov 2004 18:11:57 +0000 (+0000) Subject: (auto-mode-alist): handle .gtkrc, and under /etc passwd, group, shadow, default/... X-Git-Tag: ttn-vms-21-2-B4~3934 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b14f1885d14f1675d2645f9112ada56ac6e86e7f;p=emacs.git (auto-mode-alist): handle .gtkrc, and under /etc passwd, group, shadow, default/* and pam.d/*. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ba398122616..73bd2c588cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-11-14 Daniel Pfeiffer + + * files.el (auto-mode-alist): handle .gtkrc, and under /etc + passwd, group, shadow, default/* and pam.d/*. + 2004-11-14 Vinicius Jose Latorre * printing.el (pr-menu-spec): Adjust menu specification. diff --git a/lisp/files.el b/lisp/files.el index ad77688b6bc..1f005eea50c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1763,12 +1763,12 @@ 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\\|permissions\\|protocols\\|rpc\\|services\\)\\'" . conf-space-mode) - ("\\`/etc/\\(?:aliases\\|hosts\\..+\\|ksysguarddrc\\|opera6rc\\)\\'" . 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\\..+\\|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 - ("/\\.\\(?:enigma\\|gltron\\|hxplayer\\|net\\|neverball\\|qt/.+\\|realplayer\\|scummvm\\|sversion\\|sylpheed/.+\\|xmp\\)rc\\'" . conf-mode) + ("/\\.\\(?:enigma\\|gltron\\|gtk\\|hxplayer\\|net\\|neverball\\|qt/.+\\|realplayer\\|scummvm\\|sversion\\|sylpheed/.+\\|xmp\\)rc\\'" . conf-mode) ("/\\.\\(?:gdbtkinit\\|grip\\|orbital/.+txt\\|rhosts\\|tuxracer/options\\)\\'" . conf-mode) ("/\\.?X\\(?:default\\|resource\\|re\\)s\\>" . conf-xdefaults-mode) ("/X11.+app-defaults/" . conf-xdefaults-mode)