3 files changed, 9 insertions, 3 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 82010dc1493..f5efef377cf 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * org-html.el (org-export-as-html):
+        * org-docbook.el (org-export-as-docbook):
+        Use (default-value 'major-mode) instead of default-major-mode.
+
 2009-08-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-docbook.el: Add arch-tag.
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index 8d47b552e5d..38af0803434 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -9,7 +9,7 @@
 ;; Maintainer: Baoqiu Cui <cbaoqiu AT yahoo DOT com>
 ;; Keywords: org, wp, docbook
 ;; Description: Converts an org-mode buffer into DocBook
-;; $Id: org-docbook.el,v 1.2 2009/08/08 02:33:22 gm Exp $
+;; $Id: org-docbook.el,v 1.3 2009/08/08 12:18:56 cdominik Exp $
 ;; URL:
 
 ;; This file is part of GNU Emacs.
@@ -1102,7 +1102,7 @@ publishing directory."
 
       (unless (plist-get opt-plist :buffer-will-be-killed)
         (normal-mode)
-        (if (eq major-mode default-major-mode)
+        (if (eq major-mode (default-value 'major-mode))
             (nxml-mode)))
 
       ;; Remove empty paragraphs and lists.  Replace them with a
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 35eb45ab179..3170f3ae07c 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -1419,7 +1419,7 @@ lang=\"%s\" xml:lang=\"%s\">
 
       (unless (plist-get opt-plist :buffer-will-be-killed)
         (normal-mode)
-        (if (eq major-mode default-major-mode) (html-mode)))
+        (if (eq major-mode (default-value 'major-mode)) (html-mode)))
 
       ;; insert the table of contents
       (goto-char (point-min))