From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Aaron S. Hawley" Newsgroups: gmane.emacs.bugs Subject: bug#3473: [PATCH] sgml-tag-help fixes for HTML mode Date: Fri, 5 Jun 2009 00:48:12 -0400 Message-ID: Reply-To: "Aaron S. Hawley" , 3473@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=00221532cde4891d8b046b9299cf X-Trace: ger.gmane.org 1244177871 1154 80.91.229.12 (5 Jun 2009 04:57:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Jun 2009 04:57:51 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jun 05 06:57:47 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MCRUp-0003I3-6n for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Jun 2009 06:57:43 +0200 Original-Received: from localhost ([127.0.0.1]:56807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MCRUn-000720-CM for geb-bug-gnu-emacs@m.gmane.org; Fri, 05 Jun 2009 00:57:37 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MCRUh-00071v-Rc for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:57:31 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MCRUd-0006yr-23 for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:57:31 -0400 Original-Received: from [199.232.76.173] (port=44752 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MCRUc-0006ya-PN for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:57:26 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:54243) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MCRUb-0006jC-Cb for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:57:26 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n554vIHL022598; Thu, 4 Jun 2009 21:57:18 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n554t5an022091; Thu, 4 Jun 2009 21:55:05 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: "Aaron S. Hawley" Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 05 Jun 2009 04:55:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 3473 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.124417731621343 (code B ref -1); Fri, 05 Jun 2009 04:55:05 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 5 Jun 2009 04:48:36 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n554mTlo021337 for ; Thu, 4 Jun 2009 21:48:31 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MCRLw-0004aK-MJ for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:48:28 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MCRLr-0004a6-OE for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:48:27 -0400 Original-Received: from [199.232.76.173] (port=38392 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MCRLr-0004a3-In for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:48:23 -0400 Original-Received: from mail-gx0-f216.google.com ([209.85.217.216]:48801) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MCRLq-0005ig-4K for bug-gnu-emacs@gnu.org; Fri, 05 Jun 2009 00:48:23 -0400 Original-Received: by gxk12 with SMTP id 12so214764gxk.18 for ; Thu, 04 Jun 2009 21:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=Vd3/t4bh6ELoLenGjM+OrSkN4dq5QKntbdMfMLkiEgU=; b=icjb0zPv97QZghtrrVfuA4Z17rDsJxvsdYXreBjalxONyqxvRFffyNmjvUcD7bUYpK L8cNmwiq5RLGVR4mthMmvB9YtrZtXx8sU/0edEQ8CxfCM24AvsNiStbghj1qFqA1j0cJ PaHTp9wZZ5cZvdFbB6c05CnGAr+/13LbbGs8Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=rse/kyq2cIKWBl5tnF2oUksahznsvqhuEzFwOo8pB4I9blsamijBHqs32jqKjH6Kz9 S/tJbvaTjot91oA5QSKhZXLOK6k5BPNHdUH07y41/lNQ0ZsSqAc4PUBeqB2N2z8L8cia j8RnEUqrR88gs/7Icxw1SL1YE/PSbEHmB48PU= Original-Received: by 10.231.14.193 with SMTP id h1mr826064iba.4.1244177292139; Thu, 04 Jun 2009 21:48:12 -0700 (PDT) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 05 Jun 2009 00:57:31 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:28503 Archived-At: --00221532cde4891d8b046b9299cf Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit I noticed that `C-c ?' in HTML mode doesn't work as it is described in the Emacs manual, and for a few of the tags that it supports. Some of the tags lacked descriptions, notably DIV and SPAN. The patch below tries to rectify both of these. Here's the Emacs manual's description of `C-c ?': `C-c ? TAG ' Display a description of the meaning of tag TAG (`sgml-tag-help'). If the argument TAG is empty, describe the tag at point. Thanks for Emacs, /a Index: sgml-mode.el =================================================================== 2009-06-05 Aaron S. Hawley * textmodes/sgml-mode.el (sgml-tag-help): Prompt user for tag as the documentation describes. (html-tag-alist, html-tag-help): Add descriptions for undocumented entries and make note of obsolete tags. --- sgml-mode.el 9 Jan 2009 04:19:12 -0000 1.139 +++ sgml-mode.el 5 Jun 2009 04:31:18 -0000 @@ -720,8 +720,10 @@ (defun sgml-tag-help (&optional tag) "Display description of tag TAG. If TAG is omitted, use the tag at point." - (interactive) - (or tag + (interactive + (list (completing-read "Tag: " + sgml-tag-alist nil nil nil 'sgml-tag-history))) + (or (and tag (> (length tag) 0)) (save-excursion (if (eq (following-char) ?<) (forward-char)) @@ -1731,7 +1733,7 @@ ("array" (nil \n ("Item: " "" str (if sgml-xml-mode "") \n)) "align") - ("au") + ("au") ;; Cite an author. ("b") ("big") ("blink") @@ -1755,7 +1757,7 @@ ("dt" (t _ (if sgml-xml-mode "") "
" (if sgml-xml-mode "
") \n)) ("em") - ;("fn" "id" "fn") ; ??? + ("fn" "id" "fn") ;; Footnotes were deprecated in HTML 3.2 ("head" \n) ("html" (\n "\n" @@ -1777,7 +1779,7 @@ ("nobr") ("option" t ("value") ("label") ("selected" t)) ("over" t) - ("person") + ("person") ;; Tag for person's name tag deprecated in HTML 3.2 ("pre" \n) ("q") ("rev") @@ -1809,11 +1811,11 @@ (defvar html-tag-help `(,@sgml-tag-help ("a" . "Anchor of point or link elsewhere") - ("abbrev" . "?") - ("acronym" . "?") + ("abbrev" . "Abbreviation") + ("acronym" . "Acronym") ("address" . "Formatted mail address") ("array" . "Math array") - ("au" . "?") + ("au" . "Author") ("b" . "Bold face") ("base" . "Base address for URLs") ("big" . "Font size") @@ -1828,9 +1830,10 @@ ("cite" . "Citation of a document") ("code" . "Formatted source code") ("dd" . "Definition of term") - ("del" . "?") - ("dfn" . "?") + ("del" . "Deleted text") + ("dfn" . "Defining instance of a term") ("dir" . "Directory list (obsolete)") + ("div" . "Generic block-level container") ("dl" . "Definition list") ("dt" . "Term to be definined") ("em" . "Emphasized") @@ -1839,7 +1842,7 @@ ("figa" . "Figure anchor") ("figd" . "Figure description") ("figt" . "Figure text") - ;("fn" . "?") ; ??? + ("fn" . "Footnote") ;; No one supports special footnote rendering. ("font" . "Font size") ("form" . "Form with input fields") ("group" . "Document grouping") @@ -1855,7 +1858,7 @@ ("i" . "Italic face") ("img" . "Graphic image") ("input" . "Form input field") - ("ins" . "?") + ("ins" . "Inserted text") ("isindex" . "Input field for index search") ("kbd" . "Keybard example face") ("lang" . "Natural language") @@ -1871,15 +1874,16 @@ ("over" . "Math fraction rule") ("p" . "Paragraph start") ("panel" . "Floating panel") - ("person" . "?") + ("person" . "Person's name") ;; Originally for people harvesting. ("pre" . "Preformatted fixed width text") - ("q" . "?") + ("q" . "Quotation") ("rev" . "Reverse video") - ("s" . "?") + ("s" . "Strikeout") ("samp" . "Sample text") ("select" . "Selection list") ("small" . "Font size") ("sp" . "Nobreak space") + ("span" . "Generic inline container") ("strong" . "Standout text") ("sub" . "Subscript") ("sup" . "Superscript") -- In general, we reserve the right to have a poor memory--the computer, however, is supposed to remember! Poor computer. -- Guy Lewis Steele Jr. --00221532cde4891d8b046b9299cf Content-Type: application/octet-stream; name="sgml-mode.el.diff" Content-Disposition: attachment; filename="sgml-mode.el.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fvketfjs0 SW5kZXg6IHNnbWwtbW9kZS5lbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CjIwMDktMDYtMDUgIEFhcm9uIFMuIEhhd2xl eSAgPGFhcm9uLnMuaGF3bGV5QGdtYWlsLmNvbT4KCgkqIHRleHRtb2Rlcy9zZ21sLW1vZGUuZWwg KHNnbWwtdGFnLWhlbHApOiBQcm9tcHQgdXNlciBmb3IgdGFnIGFzCgl0aGUgZG9jdW1lbnRhdGlv biBkZXNjcmliZXMuCgkoaHRtbC10YWctYWxpc3QsIGh0bWwtdGFnLWhlbHApOiBBZGQgZGVzY3Jp cHRpb25zIGZvciB1bmRvY3VtZW50ZWQKCWVudHJpZXMgYW5kIG1ha2Ugbm90ZSBvZiBvYnNvbGV0 ZSB0YWdzLgoKLS0tIHNnbWwtbW9kZS5lbAk5IEphbiAyMDA5IDA0OjE5OjEyIC0wMDAwCTEuMTM5 CisrKyBzZ21sLW1vZGUuZWwJNSBKdW4gMjAwOSAwNDozMToxOCAtMDAwMApAQCAtNzIwLDggKzcy MCwxMCBAQAogCiAoZGVmdW4gc2dtbC10YWctaGVscCAoJm9wdGlvbmFsIHRhZykKICAgIkRpc3Bs YXkgZGVzY3JpcHRpb24gb2YgdGFnIFRBRy4gIElmIFRBRyBpcyBvbWl0dGVkLCB1c2UgdGhlIHRh ZyBhdCBwb2ludC4iCi0gIChpbnRlcmFjdGl2ZSkKLSAgKG9yIHRhZworICAoaW50ZXJhY3RpdmUK KyAgIChsaXN0IChjb21wbGV0aW5nLXJlYWQgIlRhZzogIgorCQkJICBzZ21sLXRhZy1hbGlzdCBu aWwgbmlsIG5pbCAnc2dtbC10YWctaGlzdG9yeSkpKQorICAob3IgKGFuZCB0YWcgKD4gKGxlbmd0 aCB0YWcpIDApKQogICAgICAgKHNhdmUtZXhjdXJzaW9uCiAJKGlmIChlcSAoZm9sbG93aW5nLWNo YXIpID88KQogCSAgICAoZm9yd2FyZC1jaGFyKSkKQEAgLTE3MzEsNyArMTczMyw3IEBACiAgICAg ICAoImFycmF5IiAobmlsIFxuCiAJCSAgICAoIkl0ZW06ICIgIjxpdGVtPiIgc3RyIChpZiBzZ21s LXhtbC1tb2RlICI8L2l0ZW0+IikgXG4pKQogICAgICAgICJhbGlnbiIpCi0gICAgICAoImF1IikK KyAgICAgICgiYXUiKSA7OyBDaXRlIGFuIGF1dGhvci4KICAgICAgICgiYiIpCiAgICAgICAoImJp ZyIpCiAgICAgICAoImJsaW5rIikKQEAgLTE3NTUsNyArMTc1Nyw3IEBACiAgICAgICAoImR0IiAo dCBfIChpZiBzZ21sLXhtbC1tb2RlICI8L2R0PiIpCiAgICAgICAgICAgICAgIjxkZD4iIChpZiBz Z21sLXhtbC1tb2RlICI8L2RkPiIpIFxuKSkKICAgICAgICgiZW0iKQotICAgICAgOygiZm4iICJp ZCIgImZuIikgIDsgPz8/CisgICAgICAoImZuIiAiaWQiICJmbiIpICA7OyBGb290bm90ZXMgd2Vy ZSBkZXByZWNhdGVkIGluIEhUTUwgMy4yCiAgICAgICAoImhlYWQiIFxuKQogICAgICAgKCJodG1s IiAoXG4KIAkgICAgICAgIjxoZWFkPlxuIgpAQCAtMTc3Nyw3ICsxNzc5LDcgQEAKICAgICAgICgi bm9iciIpCiAgICAgICAoIm9wdGlvbiIgdCAoInZhbHVlIikgKCJsYWJlbCIpICgic2VsZWN0ZWQi IHQpKQogICAgICAgKCJvdmVyIiB0KQotICAgICAgKCJwZXJzb24iKQorICAgICAgKCJwZXJzb24i KSA7OyBUYWcgZm9yIHBlcnNvbidzIG5hbWUgdGFnIGRlcHJlY2F0ZWQgaW4gSFRNTCAzLjIKICAg ICAgICgicHJlIiBcbikKICAgICAgICgicSIpCiAgICAgICAoInJldiIpCkBAIC0xODA5LDExICsx ODExLDExIEBACiAoZGVmdmFyIGh0bWwtdGFnLWhlbHAKICAgYCgsQHNnbWwtdGFnLWhlbHAKICAg ICAoImEiIC4gIkFuY2hvciBvZiBwb2ludCBvciBsaW5rIGVsc2V3aGVyZSIpCi0gICAgKCJhYmJy ZXYiIC4gIj8iKQotICAgICgiYWNyb255bSIgLiAiPyIpCisgICAgKCJhYmJyZXYiIC4gIkFiYnJl dmlhdGlvbiIpCisgICAgKCJhY3JvbnltIiAuICJBY3JvbnltIikKICAgICAoImFkZHJlc3MiIC4g IkZvcm1hdHRlZCBtYWlsIGFkZHJlc3MiKQogICAgICgiYXJyYXkiIC4gIk1hdGggYXJyYXkiKQot ICAgICgiYXUiIC4gIj8iKQorICAgICgiYXUiIC4gIkF1dGhvciIpCiAgICAgKCJiIiAuICJCb2xk IGZhY2UiKQogICAgICgiYmFzZSIgLiAiQmFzZSBhZGRyZXNzIGZvciBVUkxzIikKICAgICAoImJp ZyIgLiAiRm9udCBzaXplIikKQEAgLTE4MjgsOSArMTgzMCwxMCBAQAogICAgICgiY2l0ZSIgLiAi Q2l0YXRpb24gb2YgYSBkb2N1bWVudCIpCiAgICAgKCJjb2RlIiAuICJGb3JtYXR0ZWQgc291cmNl IGNvZGUiKQogICAgICgiZGQiIC4gIkRlZmluaXRpb24gb2YgdGVybSIpCi0gICAgKCJkZWwiIC4g Ij8iKQotICAgICgiZGZuIiAuICI/IikKKyAgICAoImRlbCIgLiAiRGVsZXRlZCB0ZXh0IikKKyAg ICAoImRmbiIgLiAiRGVmaW5pbmcgaW5zdGFuY2Ugb2YgYSB0ZXJtIikKICAgICAoImRpciIgLiAi RGlyZWN0b3J5IGxpc3QgKG9ic29sZXRlKSIpCisgICAgKCJkaXYiIC4gIkdlbmVyaWMgYmxvY2st bGV2ZWwgY29udGFpbmVyIikKICAgICAoImRsIiAuICJEZWZpbml0aW9uIGxpc3QiKQogICAgICgi ZHQiIC4gIlRlcm0gdG8gYmUgZGVmaW5pbmVkIikKICAgICAoImVtIiAuICJFbXBoYXNpemVkIikK QEAgLTE4MzksNyArMTg0Miw3IEBACiAgICAgKCJmaWdhIiAuICJGaWd1cmUgYW5jaG9yIikKICAg ICAoImZpZ2QiIC4gIkZpZ3VyZSBkZXNjcmlwdGlvbiIpCiAgICAgKCJmaWd0IiAuICJGaWd1cmUg dGV4dCIpCi0gICAgOygiZm4iIC4gIj8iKSAgOyA/Pz8KKyAgICAoImZuIiAuICJGb290bm90ZSIp IDs7IE5vIG9uZSBzdXBwb3J0cyBzcGVjaWFsIGZvb3Rub3RlIHJlbmRlcmluZy4KICAgICAoImZv bnQiIC4gIkZvbnQgc2l6ZSIpCiAgICAgKCJmb3JtIiAuICJGb3JtIHdpdGggaW5wdXQgZmllbGRz IikKICAgICAoImdyb3VwIiAuICJEb2N1bWVudCBncm91cGluZyIpCkBAIC0xODU1LDcgKzE4NTgs NyBAQAogICAgICgiaSIgLiAiSXRhbGljIGZhY2UiKQogICAgICgiaW1nIiAuICJHcmFwaGljIGlt YWdlIikKICAgICAoImlucHV0IiAuICJGb3JtIGlucHV0IGZpZWxkIikKLSAgICAoImlucyIgLiAi PyIpCisgICAgKCJpbnMiIC4gIkluc2VydGVkIHRleHQiKQogICAgICgiaXNpbmRleCIgLiAiSW5w dXQgZmllbGQgZm9yIGluZGV4IHNlYXJjaCIpCiAgICAgKCJrYmQiIC4gIktleWJhcmQgZXhhbXBs ZSBmYWNlIikKICAgICAoImxhbmciIC4gIk5hdHVyYWwgbGFuZ3VhZ2UiKQpAQCAtMTg3MSwxNSAr MTg3NCwxNiBAQAogICAgICgib3ZlciIgLiAiTWF0aCBmcmFjdGlvbiBydWxlIikKICAgICAoInAi IC4gIlBhcmFncmFwaCBzdGFydCIpCiAgICAgKCJwYW5lbCIgLiAiRmxvYXRpbmcgcGFuZWwiKQot ICAgICgicGVyc29uIiAuICI/IikKKyAgICAoInBlcnNvbiIgLiAiUGVyc29uJ3MgbmFtZSIpIDs7 IE9yaWdpbmFsbHkgZm9yIHBlb3BsZSBoYXJ2ZXN0aW5nLgogICAgICgicHJlIiAuICJQcmVmb3Jt YXR0ZWQgZml4ZWQgd2lkdGggdGV4dCIpCi0gICAgKCJxIiAuICI/IikKKyAgICAoInEiIC4gIlF1 b3RhdGlvbiIpCiAgICAgKCJyZXYiIC4gIlJldmVyc2UgdmlkZW8iKQotICAgICgicyIgLiAiPyIp CisgICAgKCJzIiAuICJTdHJpa2VvdXQiKQogICAgICgic2FtcCIgLiAiU2FtcGxlIHRleHQiKQog ICAgICgic2VsZWN0IiAuICJTZWxlY3Rpb24gbGlzdCIpCiAgICAgKCJzbWFsbCIgLiAiRm9udCBz aXplIikKICAgICAoInNwIiAuICJOb2JyZWFrIHNwYWNlIikKKyAgICAoInNwYW4iIC4gIkdlbmVy aWMgaW5saW5lIGNvbnRhaW5lciIpCiAgICAgKCJzdHJvbmciIC4gIlN0YW5kb3V0IHRleHQiKQog ICAgICgic3ViIiAuICJTdWJzY3JpcHQiKQogICAgICgic3VwIiAuICJTdXBlcnNjcmlwdCIpCg== --00221532cde4891d8b046b9299cf--