From: Ken Manheimer <ken.manheimer@gmail.com>
Date: Mon, 23 May 2011 15:03:04 +0000 (-0400)
Subject: * allout.el (allout-inhibit-auto-fill-on-headline): Create new
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~199
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=381987c3504943e65eb920bed05e4a3599ef3a96;p=emacs.git

* allout.el (allout-inhibit-auto-fill-on-headline): Create new
customization variable and implement: If non-nil, auto-fill will be
inhibited while on topic's header line.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7844240186e..1098bdd8224 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-23  Ken Manheimer  <ken.manheimer@gmail.com>
+
+	* allout.el (allout-inhibit-auto-fill-on-headline): Create new
+	customization variable and implement: If non-nil, auto-fill will
+	be inhibited while on topic's header line.
+
 2011-05-23  Vincent Belaïche  <vincentb1@users.sourceforge.net>
 
 	* play/5x5.el: I/ Add an arithmetic solver to suggest positions to
diff --git a/lisp/allout.el b/lisp/allout.el
index 16a816549d2..168ba6edd3d 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -399,6 +399,12 @@ else allout's special hanging-indent maintaining auto-fill function,
   :type 'boolean
   :group 'allout)
 (make-variable-buffer-local 'allout-inhibit-auto-fill)
+;;;_  = allout-inhibit-auto-fill-on-headline
+(defcustom allout-inhibit-auto-fill-on-headline nil
+  "If non-nil, auto-fill will be inhibited while on topic's header line."
+  :type 'boolean
+  :group 'allout)
+(make-variable-buffer-local 'allout-inhibit-auto-fill-on-headline)
 ;;;_  = allout-use-hanging-indents
 (defcustom allout-use-hanging-indents t
   "If non-nil, topic body text auto-indent defaults to indent of the header.
@@ -3848,7 +3854,9 @@ topic prior to the current one."
 Maintains outline hanging topic indentation if
 `allout-use-hanging-indents' is set."
 
-  (when (not allout-inhibit-auto-fill)
+  (when (and (not allout-inhibit-auto-fill)
+             (or (not allout-inhibit-auto-fill-on-headline)
+                 (not (allout-on-current-heading-p))))
     (let ((fill-prefix (if allout-use-hanging-indents
                            ;; Check for topic header indentation:
                            (save-match-data