* lisp/files.el (auto-mode-alist): Map .ad files to xdefaults-mode.

Fixes: debbugs:17745

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf2c552aeb5a3f200b04b7e745d3403a89310cf3..81b217c506af98cae7790f423186b6fc6461dda5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-12  Kevin Ryde  <user42_kevin@yahoo.com.au>
+
+       * files.el (auto-mode-alist): Map .ad files to xdefaults-mode
+       (bug#17745).
+
 2014-06-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * international/mule-cmds.el: Use lexical-binding.

diff --git a/lisp/files.el b/lisp/files.el
index 0b3e1d6f552a50e28d95f60d5b68ff8d397b1f93..9017cc967039b31adca5f1d9bb1d1ba7aebd7b7c 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2440,7 +2440,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-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)
+     ("/X11.+app-defaults/\\|\\.ad\\'" . conf-xdefaults-mode)
      ("/X11.+locale/.+/Compose\\'" . conf-colon-mode)
      ;; this contains everything twice, with space and with colon :-(
      ("/X11.+locale/compose\\.dir\\'" . conf-javaprop-mode)