(add-change-log-entry, change-log-merge):

Conditionally use `hard-newline'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb53df771ca60e7d6d214135017c7d52f9b45040..7dbc623ceaa56c55b26a799202b6d9549e60b0df 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-13  Romain Francoise  <romain@orebokech.com>
+
+       * add-log.el (add-change-log-entry, change-log-merge):
+       Conditionally use `hard-newline'.
+
 2006-01-13  Martin Rudalics  <rudalics@gmx.at>  (tiny change)
 
        * wid-edit.el (widget-field-end): If the overlay is no longer

diff --git a/lisp/add-log.el b/lisp/add-log.el
index d7f9f9b98464a183ef81a0786da352a4e26b2de8..d504b57ae17a8a7c8aa3ddaa2c7a3f5abef62148 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -1,7 +1,7 @@
 ;;; add-log.el --- change log maintenance commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: tools
@@ -551,7 +551,8 @@ non-nil, otherwise in local time."
          (forward-line 1)
        (insert (nth (random (length new-entries))
                     new-entries)
-               hard-newline hard-newline)
+               (if use-hard-newlines hard-newline "\n")
+               (if use-hard-newlines hard-newline "\n"))
        (forward-line -1)))
 
     ;; Determine where we should stop searching for a usable
@@ -584,7 +585,8 @@ non-nil, otherwise in local time."
           ;; Delete excess empty lines; make just 2.
           (while (and (not (eobp)) (looking-at "^\\s *$"))
             (delete-region (point) (line-beginning-position 2)))
-          (insert hard-newline hard-newline)
+          (insert (if use-hard-newlines hard-newline "\n")
+                  (if use-hard-newlines hard-newline "\n"))
           (forward-line -2)
           (indent-relative-maybe))
          (t
@@ -593,7 +595,9 @@ non-nil, otherwise in local time."
             (forward-line 1))
           (while (and (not (eobp)) (looking-at "^\\s *$"))
             (delete-region (point) (line-beginning-position 2)))
-          (insert hard-newline hard-newline hard-newline)
+          (insert (if use-hard-newlines hard-newline "\n")
+                  (if use-hard-newlines hard-newline "\n")
+                  (if use-hard-newlines hard-newline "\n"))
           (forward-line -2)
           (indent-to left-margin)
           (insert "* ")
@@ -1066,7 +1070,7 @@ old-style time formats for entries are supported."
                        (and (= ?\n (char-before))
                             (or (<= (1- (point)) (point-min))
                                 (= ?\n (char-before (1- (point)))))))
-             (insert hard-newline))
+             (insert (if use-hard-newlines hard-newline "\n")))
            ;; Move to the end of it to terminate outer loop.
            (with-current-buffer other-buf
              (goto-char (point-max)))