aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes/texinfo.el
diff options
context:
space:
mode:
authorStefan Monnier2011-03-21 12:42:16 -0400
committerStefan Monnier2011-03-21 12:42:16 -0400
commitcafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch)
tree7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /lisp/textmodes/texinfo.el
parenta08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff)
parent4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff)
downloademacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz
emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip
Merge from trunk
Diffstat (limited to 'lisp/textmodes/texinfo.el')
-rw-r--r--lisp/textmodes/texinfo.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index dfd12a005a9..7e9ce9aff6d 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -318,11 +318,12 @@ chapter."
318 318
319(defconst texinfo-environments 319(defconst texinfo-environments
320 '("cartouche" "copying" "defcv" "deffn" "defivar" "defmac" 320 '("cartouche" "copying" "defcv" "deffn" "defivar" "defmac"
321 "defmethod" "defop" "defopt" "defspec" "deftp" "deftypefn" 321 "defmethod" "defop" "defopt" "defspec" "deftp" "deftypecv"
322 "deftypefun" "deftypevar" "deftypevr" "defun" "defvar" 322 "deftypefn" "deftypefun" "deftypeivar" "deftypemethod"
323 "deftypeop" "deftypevar" "deftypevr" "defun" "defvar"
323 "defvr" "description" "detailmenu" "direntry" "display" 324 "defvr" "description" "detailmenu" "direntry" "display"
324 "documentdescription" "enumerate" "example" "flushleft" 325 "documentdescription" "enumerate" "example" "flushleft"
325 "flushright" "format" "ftable" "group" "ifclear" "ifset" 326 "flushright" "format" "ftable" "group" "html" "ifclear" "ifset"
326 "ifhtml" "ifinfo" "ifnothtml" "ifnotinfo" "ifnotplaintext" 327 "ifhtml" "ifinfo" "ifnothtml" "ifnotinfo" "ifnotplaintext"
327 "ifnottex" "ifplaintext" "iftex" "ignore" "itemize" "lisp" 328 "ifnottex" "ifplaintext" "iftex" "ignore" "itemize" "lisp"
328 "macro" "menu" "multitable" "quotation" "smalldisplay" 329 "macro" "menu" "multitable" "quotation" "smalldisplay"