diff options
| author | Romain Francoise <romain@orebokech.com> | 2006-01-13 20:11:35 +0000 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2006-01-13 20:11:35 +0000 |
| commit | 97f4e87c36c36f6a6382166746f763dcd36f28b2 (patch) | |
| tree | c75db4ebc44f6db3218296035fef2ce5691111f2 /lisp/add-log.el | |
| parent | e47f89f079c09db05b5eff303f047b419fa972a7 (diff) | |
| download | emacs-97f4e87c36c36f6a6382166746f763dcd36f28b2.tar.gz | |
(add-change-log-entry, change-log-merge):
Conditionally use `hard-newline'.
Diffstat (limited to 'lisp/add-log.el')
| -rw-r--r-- | lisp/add-log.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/add-log.el b/lisp/add-log.el index d7f9f9b9846..d504b57ae17 100644 --- 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))) |