(texinfo-environment-regexp): Add the def... constructs.

diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 40e77cf8bb79e1dc6958f76140a1a67358405437..f42663c9faf037fec823f7584b51b6a7af3fff28 100644 (file)
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -541,32 +541,46 @@ value of texinfo-mode-hook."
 ;; Keep as concatinated lists for ease of maintenance
 (defconst texinfo-environment-regexp
   (concat
-   "^@"
-   "\\("
-   "cartouche\\|"
-   "display\\|"
-   "end\\|"
-   "enumerate\\|"
-   "example\\|"
-   "f?table\\|"
-   "flushleft\\|"
-   "flushright\\|"
-   "format\\|"
-   "group\\|"
-   "ifhtml\\|"
-   "ifinfo\\|"
-   "iftex\\|"
-   "ignore\\|"
-   "itemize\\|"
-   "lisp\\|"
-   "macro\\|"
-   "multitable\\|"
-   "quotation\\|"
-   "smalldisplay\\|"
-   "smallexample\\|"
-   "smallformat\\|"
-   "smalllisp\\|"
-   "tex"
+   "^@\\("
+   (mapconcat 'identity
+             '("cartouche"
+               "display"
+               "end"
+               "enumerate"
+               "example"
+               "deffn"
+               "defun"
+               "defmac"
+               "defspec"
+               "defva?r"
+               "defopt"
+               "deftypefu?n"
+               "deftypeva?r"
+               "defcv"
+               "defivar"
+               "defop"
+               "defmethod"
+               "deftp"
+               "f?table"
+               "flushleft"
+               "flushright"
+               "format"
+               "group"
+               "ifhtml"
+               "ifinfo"
+               "iftex"
+               "ignore"
+               "itemize"
+               "lisp"
+               "macro"
+               "multitable"
+               "quotation"
+               "smalldisplay"
+               "smallexample"
+               "smallformat"
+               "smalllisp"
+               "tex")
+             "\\|")
    "\\)")
   "Regexp for environment-like TexInfo list commands.
    Subexpression 1 is what goes into the corresponding `@end' statement.")