summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorTassilo Horn <tsdh@gnu.org>2013-04-18 08:24:10 +0200
committerTassilo Horn <tsdh@gnu.org>2013-04-18 08:24:10 +0200
commitfc7f4d7e6a16f2fb5d166d73a678b71cd650c195 (patch)
tree18c59a5fa5895d76a2c96cdd8c1174c173cbc1eb /lisp/files.el
parent4f8902cd02ff6c182dddf5217d2683cb6abdb728 (diff)
downloademacs-fc7f4d7e6a16f2fb5d166d73a678b71cd650c195.tar.gz
* 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).
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el2
1 files changed, 1 insertions, 1 deletions
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