aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-28 14:51:26 +0000
committerGerd Moellmann2001-03-28 14:51:26 +0000
commit28d80dea8718139902af39c99da50015c3ec7184 (patch)
treef6b466819e5950777d7887e450f5972518320b99
parente719f5aea7acd2ffeb79c359c7be3b2f2ba8e553 (diff)
downloademacs-28d80dea8718139902af39c99da50015c3ec7184.tar.gz
emacs-28d80dea8718139902af39c99da50015c3ec7184.zip
(bookmark-get-bookmark): Handle case that
BOOKMARK is not a string.
-rw-r--r--lisp/bookmark.el12
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index ad43d0feae9..8ad4842e28d 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -345,11 +345,13 @@ through a file easier.")
345 345
346 346
347(defun bookmark-get-bookmark (bookmark) 347(defun bookmark-get-bookmark (bookmark)
348 "Return the full entry for BOOKMARK in bookmark-alist." 348 "Return the full entry for BOOKMARK in bookmark-alist.
349 (apply (if bookmark-completion-ignore-case 349If BOOKMARK is not a string, return nil."
350 #'assoc-ignore-case 350 (when (stringp bookmark)
351 #'assoc) 351 (apply (if bookmark-completion-ignore-case
352 (list bookmark bookmark-alist))) 352 #'assoc-ignore-case
353 #'assoc)
354 (list bookmark bookmark-alist))))
353 355
354 356
355(defun bookmark-get-bookmark-record (bookmark) 357(defun bookmark-get-bookmark-record (bookmark)