diff options
| author | Kevin Ryde <user42_kevin@yahoo.com.au> | 2014-06-11 22:14:45 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-06-11 22:14:45 -0400 |
| commit | 08cedf2e40738e996c5abe206426780b150f1cd7 (patch) | |
| tree | 4abc9538b675899a4fe449061a5620b23bf5d34d | |
| parent | 41d330324c35e03f79754cd36177d943845b9ef1 (diff) | |
| download | emacs-08cedf2e40738e996c5abe206426780b150f1cd7.tar.gz | |
* lisp/files.el (auto-mode-alist): Map .ad files to xdefaults-mode.
Fixes: debbugs:17745
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cf2c552aeb5..81b217c506a 100644 --- 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 0b3e1d6f552..9017cc96703 100644 --- 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) |