* bookmark.el (bookmark-insert-location): Handle a nil filename.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2464bfcaae0731c0b29d97708a98968b2760770..3ce0bb91c64b1e178d1b182c3f7690f78688fcbb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 3d3d411391a1b76993f0f363de8a401491ef2272..12ac760580c4560c0ba2ca38e208519401470783 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1176,7 +1176,9 @@ minibuffer history list `bookmark-history'."
   (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