From: Glenn Morris <rgm@gnu.org>
Date: Sun, 19 Apr 2015 01:37:01 +0000 (-0700)
Subject: * lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc.
X-Git-Tag: emacs-25.0.90~2371
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d;p=emacs.git

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

Fixes: debbugs:19506
---

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)