From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: [mp26@os.inf.tu-dresden.de: Patch for sgml-mode.el] Date: Thu, 22 Nov 2007 23:36:25 -0500 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: ger.gmane.org 1195792964 32067 80.91.229.12 (23 Nov 2007 04:42:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 23 Nov 2007 04:42:44 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 23 05:42:49 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IvQNK-0002J9-E4 for ged-emacs-devel@m.gmane.org; Fri, 23 Nov 2007 05:42:46 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IvQN6-0000PM-6f for ged-emacs-devel@m.gmane.org; Thu, 22 Nov 2007 23:42:32 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IvQHE-0005KW-O2 for emacs-devel@gnu.org; Thu, 22 Nov 2007 23:36:28 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IvQHD-0005Jp-5t for emacs-devel@gnu.org; Thu, 22 Nov 2007 23:36:28 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IvQHD-0005Jj-3J for emacs-devel@gnu.org; Thu, 22 Nov 2007 23:36:27 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IvQHC-0006wc-Fy for emacs-devel@gnu.org; Thu, 22 Nov 2007 23:36:26 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60) (envelope-from ) id 1IvQHB-0007Te-U9; Thu, 22 Nov 2007 23:36:25 -0500 X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:83934 Archived-At: 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 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 @@ ;;;###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 -------