Mercurial > emacs
changeset 105662:5784286c9609
* textmodes/sgml-mode.el (sgml-tag-help): Prompt user for tag.
(html-tag-alist, html-tag-help): Add descriptions for undocumented
entries and make note of obsolete tags.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 18 Oct 2009 04:06:32 +0000 |
| parents | bac26aa40069 |
| children | 2b51dcf71b63 |
| files | lisp/ChangeLog lisp/textmodes/sgml-mode.el |
| diffstat | 2 files changed, 30 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 18 03:08:32 2009 +0000 +++ b/lisp/ChangeLog Sun Oct 18 04:06:32 2009 +0000 @@ -1,3 +1,9 @@ +2009-10-18 Aaron S. Hawley <aaron.s.hawley@gmail.com> + + * textmodes/sgml-mode.el (sgml-tag-help): Prompt user for tag. + (html-tag-alist, html-tag-help): Add descriptions for undocumented + entries and make note of obsolete tags. + 2009-10-18 Stefan Monnier <monnier@iro.umontreal.ca> * net/ange-ftp.el (ange-ftp-file-size): Use unwind-protect.
--- a/lisp/textmodes/sgml-mode.el Sun Oct 18 03:08:32 2009 +0000 +++ b/lisp/textmodes/sgml-mode.el Sun Oct 18 04:06:32 2009 +0000 @@ -715,8 +715,16 @@ (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 (let ((def (save-excursion + (if (eq (following-char) ?<) (forward-char)) + (sgml-beginning-of-tag)))) + (completing-read (if def + (format "Tag (default %s): " def) + "Tag: ") + sgml-tag-alist nil nil nil + 'sgml-tag-history def)))) + (or (and tag (> (length tag) 0)) (save-excursion (if (eq (following-char) ?<) (forward-char)) @@ -1750,7 +1758,7 @@ ("dt" (t _ (if sgml-xml-mode "</dt>") "<dd>" (if sgml-xml-mode "</dd>") \n)) ("em") - ;("fn" "id" "fn") ; ??? + ("fn" "id" "fn") ;; Footnotes were deprecated in HTML 3.2 ("head" \n) ("html" (\n "<head>\n" @@ -1772,7 +1780,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") @@ -1804,11 +1812,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") @@ -1823,9 +1831,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") @@ -1834,7 +1843,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") @@ -1850,7 +1859,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") @@ -1866,15 +1875,16 @@ ("over" . "Math fraction rule") ("p" . "Paragraph start") ("panel" . "Floating panel") - ("person" . "?") + ("person" . "Person's name") ("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")