From: Stefan Monnier Date: Mon, 12 Apr 2010 19:12:36 +0000 (-0400) Subject: * bookmark.el (bookmark-insert-location): Handle a nil filename. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~530 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1979d8e663dda359d3edfda7052721241a5da42;p=emacs.git * bookmark.el (bookmark-insert-location): Handle a nil filename. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c2464bfcaae..3ce0bb91c64 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-04-12 Stefan Monnier + * 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 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