aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2009-03-13 15:58:06 +0000
committerStefan Monnier2009-03-13 15:58:06 +0000
commitccb012c57e549910127d657282e0ada2b1be7181 (patch)
tree4b556415fb4889bc2facae33aed6f33cb4fa139a
parentdc4e3ccc56bb0f2e3f8ca87a25849d5a9e1efe2c (diff)
downloademacs-ccb012c57e549910127d657282e0ada2b1be7181.tar.gz
emacs-ccb012c57e549910127d657282e0ada2b1be7181.zip
(auto-mode-alist): Add rules for OpenOffice extension
packages, as well as Opkg/Ipkg packages.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/files.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a33c1ea66f7..bd87e33cff5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12009-03-13 Stefan Monnier <monnier@iro.umontreal.ca> 12009-03-13 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * files.el (auto-mode-alist): Add rules for OpenOffice extension
4 packages, as well as Opkg/Ipkg packages.
5
3 * tar-mode.el (tar-header-block-tokenize): Presume less, check more. 6 * tar-mode.el (tar-header-block-tokenize): Presume less, check more.
4 (tar-summarize-buffer): Don't silently skip incomplete headers. 7 (tar-summarize-buffer): Don't silently skip incomplete headers.
5 (tar-mode): Revert to fundamental-mode in case of malformed tar data. 8 (tar-mode): Revert to fundamental-mode in case of malformed tar data.
diff --git a/lisp/files.el b/lisp/files.el
index 1f458dd4ee2..00207d63b24 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2205,8 +2205,8 @@ since only a single case-insensitive search through the alist is made."
2205 ("\\.\\(\ 2205 ("\\.\\(\
2206arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|\ 2206arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|\
2207ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode) 2207ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
2208 ("\\.\\(sx[dmicw]\\|od[fgpst]\\)\\'" . archive-mode) ; OpenOffice.org 2208 ("\\.\\(sx[dmicw]\\|od[fgpst]\\|oxt\\)\\'" . archive-mode) ;OpenOffice.org
2209 ("\\.\\(deb\\)\\'" . archive-mode) ; Debian packages. 2209 ("\\.\\(deb\\|[oi]pk\\)\\'" . archive-mode) ; Debian/Opkg packages.
2210 ;; Mailer puts message to be edited in 2210 ;; Mailer puts message to be edited in
2211 ;; /tmp/Re.... or Message 2211 ;; /tmp/Re.... or Message
2212 ("\\`/tmp/Re" . text-mode) 2212 ("\\`/tmp/Re" . text-mode)