diff options
| author | Chong Yidong | 2008-10-29 18:22:12 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-10-29 18:22:12 +0000 |
| commit | bdacf3958d1b9bfded926806c539a46aeab75e28 (patch) | |
| tree | 74972d77660f3508b01c9062eb42c3234c024ee3 /lisp | |
| parent | 6515ca91dc4e160920929bd9d93be5aa16359794 (diff) | |
| download | emacs-bdacf3958d1b9bfded926806c539a46aeab75e28.tar.gz emacs-bdacf3958d1b9bfded926806c539a46aeab75e28.zip | |
(bookmark-get-bookmark-record): Signal error for invalid bookmark.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/bookmark.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index a6ebc99b6f7..07ec40ec827 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -330,7 +330,8 @@ Otherwise look for the corresponding bookmark in `bookmark-alist'." | |||
| 330 | (defun bookmark-get-bookmark-record (bookmark) | 330 | (defun bookmark-get-bookmark-record (bookmark) |
| 331 | "Return the guts of the entry for BOOKMARK in `bookmark-alist'. | 331 | "Return the guts of the entry for BOOKMARK in `bookmark-alist'. |
| 332 | That is, all information but the name." | 332 | That is, all information but the name." |
| 333 | (let ((alist (cdr (bookmark-get-bookmark bookmark)))) | 333 | (let ((alist (cdr (or (bookmark-get-bookmark bookmark) |
| 334 | (error "Invalid bookmark %s" bookmark))))) | ||
| 334 | ;; The bookmark objects can either look like (NAME ALIST) or | 335 | ;; The bookmark objects can either look like (NAME ALIST) or |
| 335 | ;; (NAME . ALIST), so we have to distinguish the two here. | 336 | ;; (NAME . ALIST), so we have to distinguish the two here. |
| 336 | (if (and (null (cdr alist)) (consp (caar alist))) | 337 | (if (and (null (cdr alist)) (consp (caar alist))) |