* lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc.

Fixes: debbugs:19506
author: Glenn Morris 2015-04-18 18:37:01 -0700
committer: Glenn Morris 2015-04-18 18:37:01 -0700
commit: f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d (patch)
tree: 4c754e75390aea3a28c3cef9084bd542e2a6cbc0
parent: ef6302ff1a95fbb86a575d3124717ae2557181e5 (diff)
download: emacs-f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d.tar.gz
emacs-f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d.zip
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)
author	Glenn Morris	2015-04-18 18:37:01 -0700
committer	Glenn Morris	2015-04-18 18:37:01 -0700
commit	f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d (patch)
tree	4c754e75390aea3a28c3cef9084bd542e2a6cbc0
parent	ef6302ff1a95fbb86a575d3124717ae2557181e5 (diff)
download	emacs-f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d.tar.gz emacs-f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d.zip

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)
2519	;; this has lower priority to avoid matching changelog.sgml etc.	2519	;; this has lower priority to avoid matching changelog.sgml etc.
2520	("[cC]hange[lL]og[-.][-0-9a-z]+\\'" . change-log-mode)	2520	("[cC]hange[lL]og[-.][-0-9a-z]+\\'" . change-log-mode)
2521	;; either user's dot-files or under /etc or some such	2521	;; either user's dot-files or under /etc or some such
2522	("/\\.?\\(?:gnokiirc\\\|kde.*rc\\\|mime\\.types\\\|wgetrc\\)\\'" . conf-mode)	2522	("/\\.?\\(?:gitconfig\\\|gnokiirc\\\|hgrc\\\|kde.*rc\\\|mime\\.types\\\|wgetrc\\)\\'" . conf-mode)
2523	;; alas not all ~/.*rc files are like this	2523	;; alas not all ~/.*rc files are like this
2524	("/\\.\\(?:enigma\\\|gltron\\\|gtk\\\|hxplayer\\\|net\\\|neverball\\\|qt/.+\\\|realplayer\\\|scummvm\\\|sversion\\\|sylpheed/.+\\\|xmp\\)rc\\'" . conf-mode)	2524	("/\\.\\(?:enigma\\\|gltron\\\|gtk\\\|hxplayer\\\|net\\\|neverball\\\|qt/.+\\\|realplayer\\\|scummvm\\\|sversion\\\|sylpheed/.+\\\|xmp\\)rc\\'" . conf-mode)
2525	("/\\.\\(?:gdbtkinit\\\|grip\\\|orbital/.+txt\\\|rhosts\\\|tuxracer/options\\)\\'" . conf-mode)	2525	("/\\.\\(?:gdbtkinit\\\|grip\\\|orbital/.+txt\\\|rhosts\\\|tuxracer/options\\)\\'" . conf-mode)