(change-log-mode): Use fill-nobreak-predicate to

avoid that filling introduces lines with a single asterisk.

2 files changed, 14 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be77e72e924..ba1fb92aaab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-18  Martin Rudalics  <rudalics@gmx.at>
+
+        * add-log.el (change-log-mode): Use fill-nobreak-predicate to
+        avoid that filling introduces lines with a single asterisk.
+
+        * kmacro.el (kmacro-end-macro): When ignoring empty macro
+        avoid incorrect kmacro-ring-empty-p messages.
+        Reported by Michael Schierl <schierlm@gmx.de>
+
 2007-07-17  Michael Albinus  <michael.albinus@gmx.de>
 
         * files.el (file-remote-p): Introduce optional parameter
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 3ec00b81b35..0ff82bba2f5 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -699,6 +699,11 @@ Runs `change-log-mode-hook'.
         show-trailing-whitespace t)
   (set (make-local-variable 'fill-paragraph-function)
        'change-log-fill-paragraph)
+  ;; Avoid that filling leaves behind a single "*" on a line.
+  (add-hook 'fill-nobreak-predicate
+            '(lambda ()
+               (looking-back "^\\s *\\*\\s *" (line-beginning-position))) 
+            nil t)
   (set (make-local-variable 'indent-line-function) 'change-log-indent)
   (set (make-local-variable 'tab-always-indent) nil)
   ;; We really do want "^" in paragraph-start below: it is only the