summaryrefslogtreecommitdiff
path: root/lisp/bookmark.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-04-12 15:12:36 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2010-04-12 15:12:36 -0400
commita1979d8e663dda359d3edfda7052721241a5da42 (patch)
treeadf9be6dacea781215da563df3651246972fcc99 /lisp/bookmark.el
parent83725342d558e526bf31cb9bdcb10d5d8870e1d2 (diff)
downloademacs-a1979d8e663dda359d3edfda7052721241a5da42.tar.gz
* bookmark.el (bookmark-insert-location): Handle a nil filename.
Diffstat (limited to 'lisp/bookmark.el')
-rw-r--r--lisp/bookmark.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 3d3d411391a..12ac760580c 100644
--- 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