[mp26@os.inf.tu-dresden.de: Patch for sgml-mode.el]

[Richard Stallman <rms@gnu.org>]

Would someone please DTRT then ack?

------- Start of forwarded message -------
X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY 
	autolearn=failed version=3.1.0
Message-ID: <47457D57.7010008@os.inf.tu-dresden.de>
Date: Thu, 22 Nov 2007 14:00:07 +0100
From: Martin Pohlack <mp26@os.inf.tu-dresden.de>
MIME-Version: 1.0
To: bug-gnu-emacs@gnu.org
Content-Type: multipart/mixed; boundary="------------040006040108080505080703"
Subject: Patch for sgml-mode.el

This is a multi-part message in MIME format.
- --------------040006040108080505080703
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit

Hi,

sgml-mode.el currently contains such lines:

(define-derived-mode sgml-mode text-mode '(sgml-xml-mode "XML" "SGML")

and

(define-derived-mode html-mode sgml-mode '(sgml-xml-mode "XHTML" "HTML")
.

This violates that the third argument of define-derived-mode shall be a
string.  Furthermore, it results in "mode-name" not being a string for
html buffers.

The attached small patch against current CVS fixes these problems.

Cheers,
Martin Pohlack


- --------------040006040108080505080703
Content-Type: text/plain;
 name="sgml-mode_mode-name-fix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sgml-mode_mode-name-fix.diff"

- --- sgml-mode.el	2007-11-22 13:52:32.000000000 +0100
+++ /usr/share/emacs/23.0.60/lisp/textmodes/sgml-mode.el	2007-11-22 13:50:10.000000000 +0100
@@ -408,7 +406,7 @@
 	 (eq (char-before) ?<))))
 
 ;;;###autoload
- -(define-derived-mode sgml-mode text-mode '(sgml-xml-mode "XML" "SGML")
+(define-derived-mode sgml-mode text-mode (if sgml-xml-mode '"XML" '"SGML")
   "Major mode for editing SGML documents.
 Makes > match <.
 Keys <, &, SPC within <>, \", / and ' can be electric depending on
@@ -1890,7 +1888,7 @@
 
 \f
 ;;;###autoload
- -(define-derived-mode html-mode sgml-mode '(sgml-xml-mode "XHTML" "HTML")
+(define-derived-mode html-mode sgml-mode (if sgml-xml-mode '"XHTML" '"HTML")
   "Major mode based on SGML mode for editing HTML documents.
 This allows inserting skeleton constructs used in hypertext documents with
 completion.  See below for an introduction to HTML.  Use

- --------------040006040108080505080703--
------- End of forwarded message -------