(auto-mode-alist): Add rules for OpenOffice extension

packages, as well as Opkg/Ipkg packages.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a33c1ea66f7927cb14efcd4eec4f0f8a73c5b5c6..bd87e33cff5000328ea8125b72ddcc2bd1908e41 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * files.el (auto-mode-alist): Add rules for OpenOffice extension
+       packages, as well as Opkg/Ipkg packages.
+
        * tar-mode.el (tar-header-block-tokenize): Presume less, check more.
        (tar-summarize-buffer): Don't silently skip incomplete headers.
        (tar-mode): Revert to fundamental-mode in case of malformed tar data.

diff --git a/lisp/files.el b/lisp/files.el
index 1f458dd4ee25c35985032dc44e1a292740bdf308..00207d63b245df42be930f76b0de836fe3983d29 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2205,8 +2205,8 @@ since only a single case-insensitive search through the alist is made."
      ("\\.\\(\
 arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|\
 ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
-     ("\\.\\(sx[dmicw]\\|od[fgpst]\\)\\'" . archive-mode) ; OpenOffice.org
-     ("\\.\\(deb\\)\\'" . archive-mode)                 ; Debian packages.
+     ("\\.\\(sx[dmicw]\\|od[fgpst]\\|oxt\\)\\'" . archive-mode) ;OpenOffice.org
+     ("\\.\\(deb\\|[oi]pk\\)\\'" . archive-mode) ; Debian/Opkg packages.
      ;; Mailer puts message to be edited in
      ;; /tmp/Re.... or Message
      ("\\`/tmp/Re" . text-mode)