[Emacs-diffs] master 2101b9d 3/9: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 2101b9d170ae3e1b8939608da202a9df6b4113fa
Merge: cce8e42 1b2f83b
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    1b2f83b Fix docstring of bookmark-get-bookmark
---
 lisp/bookmark.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b1fe690..ed71dd1 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -333,8 +333,9 @@ one element from `bookmark-alist'."
   "Return the bookmark record corresponding to BOOKMARK-NAME-OR-RECORD.
 If BOOKMARK-NAME-OR-RECORD is a string, look for the corresponding
 bookmark record in `bookmark-alist'; return it if found, otherwise
-error.  Else if BOOKMARK-NAME-OR-RECORD is already a bookmark record,
-just return it."
+error.  If optional argument NOERROR is non-nil, return nil
+instead of signaling an error.  Else if BOOKMARK-NAME-OR-RECORD
+is already a bookmark record, just return it."
   (cond
    ((consp bookmark-name-or-record) bookmark-name-or-record)
    ((stringp bookmark-name-or-record)