(bookmark-show-all-annotations):

Make sure each inserted annotation ends with newline.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9a5ef9016696d9bdab82eaa2cdc41196cdfe1bb..3fff69b4d1b09b335a404a585f1a052ca6b6abaf 100644 (file)
--- 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 75c4826ae0b31fba54c5f04787d5b9244447cba4..5dc783d13d98e3f75fe3bb82d188a94441b817ea 100644 (file)
--- 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 "    ")