[Emacs-diffs] /srv/bzr/emacs/trunk r112323: * files.el (auto-mode-alist): Delete OpenDocument and StarOffice

[Tassilo Horn]

------------------------------------------------------------
revno: 112323
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Thu 2013-04-18 08:24:10 +0200
message:
  * 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).
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-18 02:20:12 +0000
+++ b/lisp/ChangeLog    2013-04-18 06:24:10 +0000
@@ -1,3 +1,9 @@
+2013-04-18  Tassilo Horn  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bindings.el (help-event-list): Add ?\?.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2013-04-14 21:57:21 +0000
+++ b/lisp/files.el     2013-04-18 06:24:10 +0000
@@ -2312,7 +2312,7 @@
      ("\\.\\(\
 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