[Emacs-diffs] trunk r117315: * lisp/files.el (auto-mode-alist): Map .ad files to xdefaults-mode.

[Stefan Monnier]

------------------------------------------------------------
revno: 117315
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17745
author: Kevin Ryde <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-06-11 22:14:45 -0400
message:
  * lisp/files.el (auto-mode-alist): Map .ad files to xdefaults-mode.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/files.el                  files.el-20091113204419-o5vbwnq5f7feedwu-265

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-12 01:47:28 +0000
+++ b/lisp/ChangeLog    2014-06-12 02:14:45 +0000
@@ -1,3 +1,8 @@
+2014-06-12  Kevin Ryde  <address@hidden>
+
+       * files.el (auto-mode-alist): Map .ad files to xdefaults-mode
+       (bug#17745).
+
 2014-06-12  Stefan Monnier  <address@hidden>
 
        * international/mule-cmds.el: Use lexical-binding.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2014-06-08 23:41:43 +0000
+++ b/lisp/files.el     2014-06-12 02:14:45 +0000
@@ -2440,7 +2440,7 @@
      
("/\\.\\(?: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)