From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Mon, 16 Jul 2007 02:17:28 +0000 (+0000)
Subject: (bookmark-show-all-annotations):
X-Git-Tag: emacs-pretest-23.0.90~11891
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd5306d288cffa8397d9fd8187872208525713f0;p=emacs.git

(bookmark-show-all-annotations):
Make sure each inserted annotation ends with newline.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9a5ef90166..3fff69b4d1b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-16  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+	* bookmark.el (bookmark-show-all-annotations):
+	Make sure each inserted annotation ends with newline.
+
 2007-07-15  Juri Linkov  <juri@jurta.org>
 
 	* delsel.el (delete-selection-pre-hook):
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 75c4826ae0b..5dc783d13d9 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1816,7 +1816,8 @@ if an annotation exists."
          (if (and ann (not (string-equal ann "")))
              ;; insert the annotation, indented by 4 spaces.
              (progn
-               (save-excursion (insert ann))
+               (save-excursion (insert ann) (unless (bolp)
+                                              (insert "\n")))
                (while (< (point) (point-max))
                  (beginning-of-line) ; paranoia
                  (insert "    ")