diff options
| author | Glenn Morris | 2019-06-01 12:04:41 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-06-01 12:04:41 -0700 |
| commit | 2101b9d170ae3e1b8939608da202a9df6b4113fa (patch) | |
| tree | 9f8fe8aab520fef6eb313298ca470b5570b99f1e | |
| parent | cce8e425a4489c424f812a816fd763f9616b65d9 (diff) | |
| parent | 1b2f83bb7984269b92eb0afb323e3e74baf87068 (diff) | |
| download | emacs-2101b9d170ae3e1b8939608da202a9df6b4113fa.tar.gz emacs-2101b9d170ae3e1b8939608da202a9df6b4113fa.zip | |
Merge from origin/emacs-26
1b2f83b Fix docstring of bookmark-get-bookmark
| -rw-r--r-- | lisp/bookmark.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index b1fe690dac0..ed71dd1ade5 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -333,8 +333,9 @@ one element from `bookmark-alist'." | |||
| 333 | "Return the bookmark record corresponding to BOOKMARK-NAME-OR-RECORD. | 333 | "Return the bookmark record corresponding to BOOKMARK-NAME-OR-RECORD. |
| 334 | If BOOKMARK-NAME-OR-RECORD is a string, look for the corresponding | 334 | If BOOKMARK-NAME-OR-RECORD is a string, look for the corresponding |
| 335 | bookmark record in `bookmark-alist'; return it if found, otherwise | 335 | bookmark record in `bookmark-alist'; return it if found, otherwise |
| 336 | error. Else if BOOKMARK-NAME-OR-RECORD is already a bookmark record, | 336 | error. If optional argument NOERROR is non-nil, return nil |
| 337 | just return it." | 337 | instead of signaling an error. Else if BOOKMARK-NAME-OR-RECORD |
| 338 | is already a bookmark record, just return it." | ||
| 338 | (cond | 339 | (cond |
| 339 | ((consp bookmark-name-or-record) bookmark-name-or-record) | 340 | ((consp bookmark-name-or-record) bookmark-name-or-record) |
| 340 | ((stringp bookmark-name-or-record) | 341 | ((stringp bookmark-name-or-record) |