diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e4050bec8c..516833ccaa2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-04-18 Tassilo Horn <tsdh@gnu.org> + + * files.el (auto-mode-alist): Delete OpenDocument and StarOffice + file extensions from the archive-mode entry in order to prefer + doc-view-mode-maybe with archive-mode as fallback (bug#14188). + 2013-04-18 Leo Liu <sdl.web@gmail.com> * bindings.el (help-event-list): Add ?\?. diff --git a/lisp/files.el b/lisp/files.el index 238be36cae0..ae5e5a23161 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2312,7 +2312,7 @@ since only a single case-insensitive search through the alist is made." ("\\.\\(\ arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) - ("\\.\\(sx[dmicw]\\|od[fgpst]\\|oxt\\)\\'" . archive-mode) ;OpenOffice.org + ("\\.oxt\\'" . archive-mode) ;(Open|Libre)Office extensions. ("\\.\\(deb\\|[oi]pk\\)\\'" . archive-mode) ; Debian/Opkg packages. ;; Mailer puts message to be edited in ;; /tmp/Re.... or Message |