emacs: fix declare-function definitions with related line breaks

- declare-function notmuch-unthreaded lacked file name
- declare-function notmuch-search had differently named last arg
  - note: check-declare-directory did not complain about that
- declare-function notmuch-search-show-thread without nil
- some functions declared to be in different file than those
  existed ("notmuch" -> "notmuch-lib")

- some related function/declare lines were (/are now) wider than
  80-columns; added line breaks (and proper indentation) there
This commit is contained in:
Tomi Ollila 2021-01-16 19:17:09 +02:00 committed by David Bremner
parent d7ddfa0d0e
commit 03366a3c5a
4 changed files with 23 additions and 15 deletions

View file

@ -28,12 +28,15 @@
(require 'notmuch-mua) (require 'notmuch-mua)
(declare-function notmuch-search "notmuch" (declare-function notmuch-search "notmuch"
(&optional query oldest-first target-thread target-line continuation)) (&optional query oldest-first target-thread target-line
(declare-function notmuch-poll "notmuch" ()) no-display))
(declare-function notmuch-poll "notmuch-lib" ())
(declare-function notmuch-tree "notmuch-tree" (declare-function notmuch-tree "notmuch-tree"
(&optional query query-context target buffer-name open-target unthreaded)) (&optional query query-context target buffer-name
(declare-function notmuch-unthreaded open-target unthreaded parent-buffer))
(&optional query query-context target buffer-name open-target)) (declare-function notmuch-unthreaded "notmuch-tree"
(&optional query query-context target buffer-name
open-target))
;;; Options ;;; Options

View file

@ -39,19 +39,20 @@
(require 'notmuch-print) (require 'notmuch-print)
(require 'notmuch-draft) (require 'notmuch-draft)
(declare-function notmuch-call-notmuch-process "notmuch" (&rest args)) (declare-function notmuch-call-notmuch-process "notmuch-lib" (&rest args))
(declare-function notmuch-search-next-thread "notmuch" nil) (declare-function notmuch-search-next-thread "notmuch" nil)
(declare-function notmuch-search-previous-thread "notmuch" nil) (declare-function notmuch-search-previous-thread "notmuch" nil)
(declare-function notmuch-search-show-thread "notmuch" nil) (declare-function notmuch-search-show-thread "notmuch")
(declare-function notmuch-foreach-mime-part "notmuch" (function mm-handle)) (declare-function notmuch-foreach-mime-part "notmuch" (function mm-handle))
(declare-function notmuch-count-attachments "notmuch" (mm-handle)) (declare-function notmuch-count-attachments "notmuch" (mm-handle))
(declare-function notmuch-save-attachments "notmuch" (mm-handle &optional queryp)) (declare-function notmuch-save-attachments "notmuch" (mm-handle &optional queryp))
(declare-function notmuch-tree "notmuch-tree" (declare-function notmuch-tree "notmuch-tree"
(&optional query query-context target buffer-name (&optional query query-context target buffer-name
open-target unthreaded)) open-target unthreaded parent-buffer))
(declare-function notmuch-tree-get-message-properties "notmuch-tree" nil) (declare-function notmuch-tree-get-message-properties "notmuch-tree" nil)
(declare-function notmuch-unthreaded (declare-function notmuch-unthreaded "notmuch-tree"
(&optional query query-context target buffer-name open-target)) (&optional query query-context target buffer-name
open-target))
(declare-function notmuch-read-query "notmuch" (prompt)) (declare-function notmuch-read-query "notmuch" (prompt))
(declare-function notmuch-draft-resume "notmuch-draft" (id)) (declare-function notmuch-draft-resume "notmuch-draft" (id))

View file

@ -34,8 +34,9 @@
(require 'notmuch-jump) (require 'notmuch-jump)
(declare-function notmuch-search "notmuch" (declare-function notmuch-search "notmuch"
(&optional query oldest-first target-thread target-line)) (&optional query oldest-first target-thread target-line
(declare-function notmuch-call-notmuch-process "notmuch" (&rest args)) no-display))
(declare-function notmuch-call-notmuch-process "notmuch-lib" (&rest args))
(declare-function notmuch-read-query "notmuch" (prompt)) (declare-function notmuch-read-query "notmuch" (prompt))
(declare-function notmuch-search-find-thread-id "notmuch" (&optional bare)) (declare-function notmuch-search-find-thread-id "notmuch" (&optional bare))
(declare-function notmuch-search-find-subject "notmuch" ()) (declare-function notmuch-search-find-subject "notmuch" ())
@ -1112,7 +1113,8 @@ the same as for the function notmuch-tree."
")") ")")
notmuch-tree-basic-query)) notmuch-tree-basic-query))
(defun notmuch-tree (&optional query query-context target buffer-name open-target unthreaded parent-buffer) (defun notmuch-tree (&optional query query-context target buffer-name
open-target unthreaded parent-buffer)
"Display threads matching QUERY in tree view. "Display threads matching QUERY in tree view.
The arguments are: The arguments are:
@ -1145,7 +1147,8 @@ The arguments are:
(setq notmuch-tree-parent-buffer parent-buffer) (setq notmuch-tree-parent-buffer parent-buffer)
(setq truncate-lines t)) (setq truncate-lines t))
(defun notmuch-unthreaded (&optional query query-context target buffer-name open-target) (defun notmuch-unthreaded (&optional query query-context target buffer-name
open-target)
(interactive) (interactive)
(notmuch-tree query query-context target buffer-name open-target t)) (notmuch-tree query query-context target buffer-name open-target t))

View file

@ -973,7 +973,8 @@ PROMPT is the string to prompt with."
(put 'notmuch-search 'notmuch-doc "Search for messages.") (put 'notmuch-search 'notmuch-doc "Search for messages.")
;;;###autoload ;;;###autoload
(defun notmuch-search (&optional query oldest-first target-thread target-line no-display) (defun notmuch-search (&optional query oldest-first target-thread target-line
no-display)
"Display threads matching QUERY in a notmuch-search buffer. "Display threads matching QUERY in a notmuch-search buffer.
If QUERY is nil, it is read interactively from the minibuffer. If QUERY is nil, it is read interactively from the minibuffer.