Commit 1da94541 authored by Chong Yidong's avatar Chong Yidong
Browse files

* 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.
parent 4c0354d7
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.
......
......@@ -715,8 +715,16 @@ With prefix argument, only self insert."
(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 @@ This takes effect when first loading the library.")
("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 @@ This takes effect when first loading the library.")
("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 @@ This takes effect when first loading the library.")
(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 @@ This takes effect when first loading the library.")
("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 @@ This takes effect when first loading the library.")
("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 @@ This takes effect when first loading the library.")
("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 @@ This takes effect when first loading the library.")
("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")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment