[Emacs-diffs] /srv/bzr/emacs/trunk r104329: * allout.el (allout-inhibit-auto-fill-on-headline): Create new

[Ken Manheimer]

------------------------------------------------------------
revno: 104329
committer: Ken Manheimer <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-23 11:03:04 -0400
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/allout.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-23 14:46:41 +0000
+++ b/lisp/ChangeLog    2011-05-23 15:03:04 +0000
@@ -1,3 +1,9 @@
+2011-05-23  Ken Manheimer  <address@hidden>
+
+       * 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  <address@hidden>
 
        * play/5x5.el: I/ Add an arithmetic solver to suggest positions to

=== modified file 'lisp/allout.el'
--- a/lisp/allout.el    2011-05-14 20:11:34 +0000
+++ b/lisp/allout.el    2011-05-23 15:03:04 +0000
@@ -399,6 +399,12 @@
   :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 @@
 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