(texinfo-mode): Prevent filling lines

starting with `@def' or `@multitable', in addition to ones
specified by the user in auto-fill-inhibit-regexp.

1 files changed, 12 insertions, 1 deletions

diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index ce751e965ef..3a87b79e95e 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -530,7 +530,18 @@ value of `texinfo-mode-hook'."
   (make-local-variable 'tex-first-line-header-regexp)
   (setq tex-first-line-header-regexp "^\\\\input")
   (make-local-variable 'tex-trailer)
-  (setq tex-trailer "@bye\n"))
+  (setq tex-trailer "@bye\n")
+
+  ;; Prevent filling certain lines, in addition to ones specified
+  ;; by the user.
+  (let ((prevent-filling "^@\\(def\\|multitable\\)"))
+    (make-local-variable 'auto-fill-inhibit-regexp)
+    (if (null auto-fill-inhibit-regexp)
+        (setq auto-fill-inhibit-regexp prevent-filling)
+      (setq auto-fill-inhibit-regexp
+            (concat "\\(" auto-fill-inhibit-regexp "\\)\\|\\("
+                    prevent-filling "\\)")))))
+                  
 
 
 ;;; Insert string commands