Skip to content

Commit fb6610f

Browse files
skangasEli-Zaretskii
authored andcommitted
Checkdoc fixes in lisp/bookmark.el
* lisp/bookmark.el (bookmark-bmenu-inline-header-height) (bookmark-bmenu-marks-width, bookmark-map, bookmark-quit-flag) (bookmark-name-from-full-record, bookmark-set-internal) (bookmark-insert-annotation, bookmark--jump-via) (bookmark-bmenu-set-header, bookmark-show-annotation) (bookmark-bmenu-other-window-with-mouse, bookmark-bmenu-relocate): Checkdoc docstring fixes. (Bug#35916)
1 parent 1e6396e commit fb6610f

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

lisp/bookmark.el

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,13 @@ This is as opposed to inline text at the top of the buffer."
136136
:group 'bookmark)
137137

138138
(defconst bookmark-bmenu-inline-header-height 2
139-
"Number of lines used for the *Bookmark List* header
140-
\(only significant when `bookmark-bmenu-use-header-line' is nil).")
139+
"Number of lines used for the *Bookmark List* header.
140+
\(This is only significant when `bookmark-bmenu-use-header-line'
141+
is nil.)")
141142

142143
(defconst bookmark-bmenu-marks-width 2
143-
"Number of columns (chars) used for the *Bookmark List* marks column,
144-
including the annotations column.")
144+
"Number of columns (chars) used for the *Bookmark List* marks column.
145+
This includes the annotations column.")
145146

146147
(defcustom bookmark-bmenu-file-column 30
147148
"Column at which to display filenames in a buffer listing bookmarks.
@@ -221,7 +222,7 @@ A non-nil value may result in truncated bookmark names."
221222
"Keymap containing bindings to bookmark functions.
222223
It is not bound to any key by default: to bind it
223224
so that you have a bookmark prefix, just use `global-set-key' and bind a
224-
key of your choice to `bookmark-map'. All interactive bookmark
225+
key of your choice to variable `bookmark-map'. All interactive bookmark
225226
functions have a binding in this keymap.")
226227

227228
;;;###autoload (fset 'bookmark-map bookmark-map)
@@ -301,7 +302,7 @@ This point is in `bookmark-current-buffer'.")
301302

302303

303304
(defvar bookmark-quit-flag nil
304-
"Non nil make `bookmark-bmenu-search' quit immediately.")
305+
"Non-nil means `bookmark-bmenu-search' quits immediately.")
305306

306307
;; Helper functions and macros.
307308

@@ -318,8 +319,8 @@ This point is in `bookmark-current-buffer'.")
318319
;; Everyone else should go through them.
319320

320321
(defun bookmark-name-from-full-record (bookmark-record)
321-
"Return the name of BOOKMARK-RECORD. BOOKMARK-RECORD is, e.g.,
322-
one element from `bookmark-alist'."
322+
"Return the name of BOOKMARK-RECORD.
323+
BOOKMARK-RECORD is, e.g., one element from `bookmark-alist'."
323324
(car bookmark-record))
324325

325326

@@ -346,8 +347,8 @@ is already a bookmark record, just return it."
346347

347348

348349
(defun bookmark-get-bookmark-record (bookmark-name-or-record)
349-
"Return the record portion of the entry for BOOKMARK-NAME-OR-RECORD in
350-
`bookmark-alist' (that is, all information but the name)."
350+
"Return the record portion of BOOKMARK-NAME-OR-RECORD in `bookmark-alist'.
351+
In other words, return all information but the name."
351352
(let ((alist (cdr (bookmark-get-bookmark bookmark-name-or-record))))
352353
;; The bookmark objects can either look like (NAME ALIST) or
353354
;; (NAME . ALIST), so we have to distinguish the two here.
@@ -812,7 +813,7 @@ is ever deleted."
812813
(cond
813814
((eq overwrite-or-push nil)
814815
(if (bookmark-get-bookmark str t)
815-
(error "A bookmark named \"%s\" already exists." str)
816+
(error "A bookmark named \"%s\" already exists" str)
816817
(bookmark-store str (cdr record) nil)))
817818
((eq overwrite-or-push 'overwrite)
818819
(bookmark-store str (cdr record) nil))
@@ -937,6 +938,7 @@ It takes one argument, the name of the bookmark, as a string.")
937938
"Keymap for editing an annotation of a bookmark.")
938939

939940
(defun bookmark-insert-annotation (bookmark-name-or-record)
941+
"Insert annotation for BOOKMARK-NAME-OR-RECORD at point."
940942
(insert (funcall bookmark-edit-annotation-text-func bookmark-name-or-record))
941943
(let ((annotation (bookmark-get-annotation bookmark-name-or-record)))
942944
(if (and annotation (not (string-equal annotation "")))
@@ -1066,8 +1068,8 @@ If `bookmark-sort-flag' is non-nil, then return a sorted copy of the alist."
10661068
Useful for example to unhide text in `outline-mode'.")
10671069

10681070
(defun bookmark--jump-via (bookmark-name-or-record display-function)
1069-
"Handle BOOKMARK-NAME-OR-RECORD, then call DISPLAY-FUNCTION with
1070-
current buffer as argument.
1071+
"Handle BOOKMARK-NAME-OR-RECORD, then call DISPLAY-FUNCTION.
1072+
DISPLAY-FUNCTION is called with the current buffer as argument.
10711073
10721074
After calling DISPLAY-FUNCTION, set window point to the point specified
10731075
by BOOKMARK-NAME-OR-RECORD, if necessary, run `bookmark-after-jump-hook',
@@ -1676,7 +1678,7 @@ deletion, or > if it is flagged for displaying."
16761678
(defalias 'edit-bookmarks 'bookmark-bmenu-list)
16771679

16781680
(defun bookmark-bmenu-set-header ()
1679-
"Sets the immutable header line."
1681+
"Set the immutable header line."
16801682
(let ((header (concat "%% " "Bookmark")))
16811683
(when bookmark-bmenu-toggle-filenames
16821684
(setq header (concat header
@@ -1836,8 +1838,8 @@ last full line, move to the last full line. The return value is undefined."
18361838

18371839

18381840
(defun bookmark-show-annotation (bookmark-name-or-record)
1839-
"Display the annotation for BOOKMARK-NAME-OR-RECORD in a buffer,
1840-
if an annotation exists."
1841+
"Display the annotation for BOOKMARK-NAME-OR-RECORD in a buffer.
1842+
If the annotation does not exist, do nothing."
18411843
(let ((annotation (bookmark-get-annotation bookmark-name-or-record)))
18421844
(when (and annotation (not (string-equal annotation "")))
18431845
(save-excursion
@@ -1998,7 +2000,9 @@ The current window remains selected."
19982000
(bookmark--jump-via bookmark fun)))
19992001

20002002
(defun bookmark-bmenu-other-window-with-mouse (event)
2001-
"Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."
2003+
"Jump to bookmark at mouse EVENT position in other window.
2004+
Move point in menu buffer to the position of EVENT and leave
2005+
bookmark menu visible."
20022006
(interactive "e")
20032007
(with-current-buffer (window-buffer (posn-window (event-end event)))
20042008
(save-excursion
@@ -2124,8 +2128,8 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
21242128
(message "%s" (bookmark-location bmrk))))
21252129

21262130
(defun bookmark-bmenu-relocate ()
2127-
"Change the file path of the bookmark on the current line,
2128-
prompting with completion for the new path."
2131+
"Change the absolute file name of the bookmark on the current line.
2132+
Prompt with completion for the new path."
21292133
(interactive)
21302134
(let ((bmrk (bookmark-bmenu-bookmark))
21312135
(thispoint (point)))

0 commit comments

Comments
 (0)