2 files changed, 3 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb0ffae62a7..171adba7674 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,7 @@
 2001-10-26  Sam Steingold  <sds@gnu.org>
 
         * textmodes/sgml-mode.el (html-mode): Set `html-xhtml' from the
-        DOCTYPE.
+        DOCTYPE; set `mode-name' based on it.
         (html-tag-alist): Use `html-xhtml' for "li", "dt" and "dd".
         (sgml-tag): Close empty tags in XHTML.
 
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 8822bdb132f..e864327a13f 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1283,6 +1283,8 @@ To work around that, do:
              nil t)
         (set (make-local-variable 'html-xhtml)
              (string= "X" (match-string 1))))))
+  (when html-xhtml
+    (setq mode-name "XHTML"))
   ;; It's for the user to decide if it defeats it or not  -stef
   ;; (make-local-variable 'imenu-sort-function)
   ;; (setq imenu-sort-function nil) ; sorting the menu defeats the purpose