1 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7081edf4100..6a7bcf9745b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+
+        * doc-view.el (doc-view-set-doc-type): New function refactored
+        from doc-view-mode.
+        (doc-view-fallback-mode): New function.
+        (doc-view-mode): Use it.
+        (doc-view-mode-maybe): New function that checks if doc-view-mode
+        can be used and falls back to the next best mode otherwise.
+
+        * files.el (auto-mode-alist): Use doc-view-mode-maybe for PDF,
+        DVI, OpenDocument, and MS Office files.
+
 2010-12-30  Andreas Schwab  <schwab@linux-m68k.org>
 
         * emacs-lisp/rx.el (rx-syntax): Fix typo.