[Emacs-diffs] /srv/bzr/emacs/trunk r99884: * bookmark.el (bookmark-insert-location): Handle a nil filename.

[Stefan Monnier]

------------------------------------------------------------
revno: 99884
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-12 15:12:36 -0400
message:
  * bookmark.el (bookmark-insert-location): Handle a nil filename.
modified:
  lisp/ChangeLog
  lisp/bookmark.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-04-12 16:09:47 +0000
+++ b/lisp/ChangeLog    2010-04-12 19:12:36 +0000
@@ -1,5 +1,7 @@
 2010-04-12  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2010-04-12 16:09:47 +0000
+++ b/lisp/bookmark.el  2010-04-12 19:12:36 +0000
@@ -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