Subject: bug#20148: 24.4: function `bookmark-get-bookmark'

From: Stefan Kangas <[email-masked]>
Date: Sun, 26 May 2019 12:12:33 +0200

The attached patch fixes the docstring as suggested above.

>From the above discussion, I believe this bug report can be closed once
this has
been applied.

Thanks,
Stefan Kangas
From a874f231ba0216ca2c3feedaae8ddb32f378f80e Mon Sep 17 00:00:00 2001
From: Stefan Kangas <[email-masked]>
Date: Sun, 26 May 2019 12:04:56 +0200
Subject: [PATCH] Fix docstring of bookmark-get-bookmark

* bookmark.el (bookmark-get-bookmark): Fix docstring.
---
 lisp/bookmark.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b1fe690dac..5c14f705eb 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -334,7 +334,9 @@ bookmark-get-bookmark
 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."
+just return it.
+Signal an error if bookmark is invalid.  If optional argument
+NOERROR is non-nil, return nil instead."
   (cond
    ((consp bookmark-name-or-record) bookmark-name-or-record)
    ((stringp bookmark-name-or-record)
-- 
2.11.0