2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e96200885a0..6aa6993a70a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-08  Arni Magnusson  <arnima@hafro.is>  (tiny change)
+
+        * textmodes/texinfo.el (texinfo-environments):
+        Add deftypecv, deftypeivar, deftypemethod, deftypeop, html.  (Bug#2783)
+
 2011-03-08  Glenn Morris  <rgm@gnu.org>
 
         * cus-start.el (cursor-in-non-selected-windows):
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."
 
 (defconst texinfo-environments
   '("cartouche" "copying" "defcv" "deffn" "defivar" "defmac"
-    "defmethod" "defop" "defopt" "defspec" "deftp" "deftypefn"
-    "deftypefun" "deftypevar" "deftypevr" "defun" "defvar"
+    "defmethod" "defop" "defopt" "defspec" "deftp" "deftypecv"
+    "deftypefn" "deftypefun" "deftypeivar" "deftypemethod"
+    "deftypeop" "deftypevar" "deftypevr" "defun" "defvar"
     "defvr" "description" "detailmenu" "direntry" "display"
     "documentdescription" "enumerate" "example" "flushleft"
-    "flushright" "format" "ftable" "group" "ifclear" "ifset"
+    "flushright" "format" "ftable" "group" "html" "ifclear" "ifset"
     "ifhtml" "ifinfo" "ifnothtml" "ifnotinfo" "ifnotplaintext"
     "ifnottex" "ifplaintext" "iftex" "ignore" "itemize" "lisp"
     "macro" "menu" "multitable" "quotation" "smalldisplay"