procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-26

Browse source 
1b2f83b Fix docstring of bookmark-get-bookmark
This commit is contained in:
Glenn Morris 2019-06-01 12:04:41 -07:00
commit 2101b9d170
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/bookmark.el
View file

@ -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)