From: Philip K <philipk@posteo.net>
Date: Wed, 14 Apr 2021 17:19:01 +0000 (+0200)
Subject: sgml-mode: Only set sgml-xml-mode if guessed to be an XML file
X-Git-Tag: emacs-28.0.90~2794
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e727cf20baf33ae77e1955a1751c4d86a32af98;p=emacs.git

sgml-mode: Only set sgml-xml-mode if guessed to be an XML file

* lisp/textmodes/sgml-mode.el (sgml-mode): Don't override
sgml-xml-mode if the result of the guess is used as the buffer local
value.  (Bug#47877)
---

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 67f731917e2..d5930e82df3 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -623,7 +623,8 @@ Do \\[describe-key] on the following bindings to discover what they do.
   (setq-local syntax-propertize-function #'sgml-syntax-propertize)
   (setq-local syntax-ppss-table sgml-tag-syntax-table)
   (setq-local facemenu-add-face-function 'sgml-mode-facemenu-add-face-function)
-  (setq-local sgml-xml-mode (sgml-xml-guess))
+  (when (sgml-xml-guess)
+    (setq-local sgml-xml-mode t))
   (unless sgml-xml-mode
     (setq-local skeleton-transformation-function sgml-transformation-function))
   ;; This will allow existing comments within declarations to be