1 files changed, 40 insertions, 26 deletions
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 40e77cf8bb7..f42663c9faf 100644
--- 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
-   "^@"
+   "^@\\("
-   "\\("
+   (mapconcat 'identity
-   "cartouche\\|"
+              '("cartouche"
-   "display\\|"
+                "display"
-   "end\\|"
+                "end"
-   "enumerate\\|"
+                "enumerate"
-   "example\\|"
+                "example"
-   "f?table\\|"
+                "deffn"
-   "flushleft\\|"
+                "defun"
-   "flushright\\|"
+                "defmac"
-   "format\\|"
+                "defspec"
-   "group\\|"
+                "defva?r"
-   "ifhtml\\|"
+                "defopt"
-   "ifinfo\\|"
+                "deftypefu?n"
-   "iftex\\|"
+                "deftypeva?r"
-   "ignore\\|"
+                "defcv"
-   "itemize\\|"
+                "defivar"
-   "lisp\\|"
+                "defop"
-   "macro\\|"
+                "defmethod"
-   "multitable\\|"
+                "deftp"
-   "quotation\\|"
+                "f?table"
-   "smalldisplay\\|"
+                "flushleft"
-   "smallexample\\|"
+                "flushright"
-   "smallformat\\|"
+                "format"
-   "smalllisp\\|"
+                "group"
-   "tex"
+                "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.")

diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index 40e77cf8bb7..f42663c9faf 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el
@@ -541,32 +541,46 @@ value of texinfo-mode-hook."
541	;; Keep as concatinated lists for ease of maintenance	541	;; Keep as concatinated lists for ease of maintenance
542	(defconst texinfo-environment-regexp	542	(defconst texinfo-environment-regexp
543	(concat	543	(concat
544	"^@"	544	"^@\\("
545	"\\("	545	(mapconcat 'identity
546	"cartouche\\\|"	546	'("cartouche"
547	"display\\\|"	547	"display"
548	"end\\\|"	548	"end"
549	"enumerate\\\|"	549	"enumerate"
550	"example\\\|"	550	"example"
551	"f?table\\\|"	551	"deffn"
552	"flushleft\\\|"	552	"defun"
553	"flushright\\\|"	553	"defmac"
554	"format\\\|"	554	"defspec"
555	"group\\\|"	555	"defva?r"
556	"ifhtml\\\|"	556	"defopt"
557	"ifinfo\\\|"	557	"deftypefu?n"
558	"iftex\\\|"	558	"deftypeva?r"
559	"ignore\\\|"	559	"defcv"
560	"itemize\\\|"	560	"defivar"
561	"lisp\\\|"	561	"defop"
562	"macro\\\|"	562	"defmethod"
563	"multitable\\\|"	563	"deftp"
564	"quotation\\\|"	564	"f?table"
565	"smalldisplay\\\|"	565	"flushleft"
566	"smallexample\\\|"	566	"flushright"
567	"smallformat\\\|"	567	"format"
568	"smalllisp\\\|"	568	"group"
569	"tex"	569	"ifhtml"
		570	"ifinfo"
		571	"iftex"
		572	"ignore"
		573	"itemize"
		574	"lisp"
		575	"macro"
		576	"multitable"
		577	"quotation"
		578	"smalldisplay"
		579	"smallexample"
		580	"smallformat"
		581	"smalllisp"
		582	"tex")
		583	"\\\|")
570	"\\)")	584	"\\)")
571	"Regexp for environment-like TexInfo list commands.	585	"Regexp for environment-like TexInfo list commands.
572	Subexpression 1 is what goes into the corresponding `@end' statement.")	586	Subexpression 1 is what goes into the corresponding `@end' statement.")