Mercurial > emacs

changeset 107840:e84bec592536

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* bookmark.el (bookmark-insert-location): Handle a nil filename.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 12 Apr 2010 15:12:36 -0400
parents 117dfaee55b8
children 2cdeb4c70d45
files lisp/ChangeLog lisp/bookmark.el
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Apr 12 20:58:15 2010 +0200
+++ b/lisp/ChangeLog	Mon Apr 12 15:12:36 2010 -0400
@@ -1,5 +1,7 @@
 2010-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* bookmark.el (bookmark-insert-location): Handle a nil filename.
+
 	* woman.el: Add bookmark declarations to silence the compiler.
 	(bookmark-prop-get): Use `man-args' rather than `filename' as a first
 	step to compatibility between man and woman bookmarks.
--- a/lisp/bookmark.el	Mon Apr 12 20:58:15 2010 +0200
+++ b/lisp/bookmark.el	Mon Apr 12 15:12:36 2010 -0400
@@ -1176,7 +1176,9 @@
   (or no-history (bookmark-maybe-historicize-string bookmark))
   (let ((start (point)))
     (prog1
-	(insert (bookmark-location bookmark)) ; *Return this line*
+        ;; FIXME: Each bookmark should come with a `location' method
+        ;; rather than just say "-- no file --".
+	(insert (or (bookmark-location bookmark) "   -- no file --"))
       (if (display-mouse-p)
 	  (add-text-properties
 	   start