summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-04-18 18:37:01 -0700
committerGlenn Morris <rgm@gnu.org>2015-04-18 18:37:01 -0700
commitf4f1380deac296fb6ece142b16bf0ae2f3bdbd4d (patch)
tree4c754e75390aea3a28c3cef9084bd542e2a6cbc0 /lisp/files.el
parentef6302ff1a95fbb86a575d3124717ae2557181e5 (diff)
downloademacs-f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d.tar.gz
* lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc.
Fixes: debbugs:19506
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 5ef7318ca45..0b011f4c363 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2519,7 +2519,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
;; this has lower priority to avoid matching changelog.sgml etc.
("[cC]hange[lL]og[-.][-0-9a-z]+\\'" . change-log-mode)
;; either user's dot-files or under /etc or some such
- ("/\\.?\\(?:gnokiirc\\|kde.*rc\\|mime\\.types\\|wgetrc\\)\\'" . conf-mode)
+ ("/\\.?\\(?:gitconfig\\|gnokiirc\\|hgrc\\|kde.*rc\\|mime\\.types\\|wgetrc\\)\\'" . conf-mode)
;; alas not all ~/.*rc files are like this
("/\\.\\(?:enigma\\|gltron\\|gtk\\|hxplayer\\|net\\|neverball\\|qt/.+\\|realplayer\\|scummvm\\|sversion\\|sylpheed/.+\\|xmp\\)rc\\'" . conf-mode)
("/\\.\\(?:gdbtkinit\\|grip\\|orbital/.+txt\\|rhosts\\|tuxracer/options\\)\\'" . conf-mode)