emacs: inline notmuch-documentation-first-line

Inline a simplified version of `notmuch-documentation-first-line'
into its only caller.  The new code snippet differs from the
removed function in that it returns nil instead of the empty string
for symbols that have no function documentation.  That value is
ultimately used as an argument to `concat', which treats nil like
the empty string.  So we can do the logical thing without changing
the behavior.
This commit is contained in:
Jonas Bernoulli 2020-11-16 22:28:36 +01:00 committed by David Bremner
parent 6db692302d
commit 4f57e01843

View file

@ -287,18 +287,6 @@ it, in which case it is killed."
(bury-buffer) (bury-buffer)
(kill-buffer))) (kill-buffer)))
(defun notmuch-documentation-first-line (symbol)
"Return the first line of the documentation string for SYMBOL."
(let ((doc (documentation symbol)))
(if doc
(with-temp-buffer
(insert (documentation symbol t))
(goto-char (point-min))
(let ((beg (point)))
(end-of-line)
(buffer-substring beg (point))))
"")))
(defun notmuch-prefix-key-description (key) (defun notmuch-prefix-key-description (key)
"Given a prefix key code, return a human-readable string representation. "Given a prefix key code, return a human-readable string representation.
@ -331,7 +319,10 @@ It does not prepend if ACTUAL-KEY is already listed in TAIL."
(or (and (symbolp binding) (or (and (symbolp binding)
(get binding 'notmuch-doc)) (get binding 'notmuch-doc))
(and (functionp binding) (and (functionp binding)
(notmuch-documentation-first-line binding)))) (let ((doc (documentation binding)))
(and doc
(string-match "\\`.+" doc)
(match-string 0 doc))))))
tail))) tail)))
tail) tail)