Stephen Berman <Stephen.Berman at gmx.net>

(auto-mode-alist): Recognize more OpenOffice.org extensions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b91eb0f477113c860488e68fbb742fed15b6ffe0..202ff469c502f49c0f4847bacaf4e2a7c9f4ea85 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2008-11-20  Glenn Morris  <rgm@gnu.org>
+
+       * format.el (format-alist, format-write-file): Doc fix.
+
+       * proced.el (proced-available): New variable.
+       (proced-process-attributes): Move availability check from previous
+       change from here...
+       (proced): ... to here.
+
+       * vc-hg.el (vc-hg-diff-switches): New option.
+       (vc-hg-diff): Apply diff switches.  (Bug#1017)
+
+       * calc/calc-units.el (math-additional-units): Doc fix (active voice).
+
+       * progmodes/fortran.el (fortran-mode-map): Add some menu :help.
+
+2008-11-20  Stephen Berman  <Stephen.Berman@gmx.net>
+
+       * files.el (auto-mode-alist): Recognize more OpenOffice.org extensions.
+
 2008-11-19  Juanma Barranquero  <lekktu@gmail.com>
 
        * calc/calc-units.el (math-units-table): Doc fix.

diff --git a/lisp/files.el b/lisp/files.el
index 347f9563d06bb76085351f18e1af409ce36e8885..b8cf37a18e6a73a0897141a82dde05685e32aa2e 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2136,7 +2136,7 @@ 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]\\|odt\\)\\'" . archive-mode)    ; OpenOffice.org
+     ("\\.\\(sx[dmicw]\\|od[fgpst]\\)\\'" . archive-mode) ; OpenOffice.org
      ("\\.\\(deb\\)\\'" . archive-mode)                 ; Debian packages.
      ;; Mailer puts message to be edited in
      ;; /tmp/Re.... or Message