* [PATCH 1/3] emacs: fix declare-function definitions with related line breaks
@ 2021-01-16 17:17 Tomi Ollila
2021-06-07 23:34 ` David Bremner
0 siblings, 1 reply; 2+ messages in thread
From: Tomi Ollila @ 2021-01-16 17:17 UTC (permalink / raw)
To: notmuch; +Cc: tomi.ollila
- 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
---
emacs/notmuch-hello.el | 13 ++++++++-----
emacs/notmuch-show.el | 11 ++++++-----
emacs/notmuch-tree.el | 11 +++++++----
emacs/notmuch.el | 3 ++-
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 24d2d19e..531f209d 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -28,12 +28,15 @@
(require 'notmuch-mua)
(declare-function notmuch-search "notmuch"
- (&optional query oldest-first target-thread target-line continuation))
-(declare-function notmuch-poll "notmuch" ())
+ (&optional query oldest-first target-thread target-line
+ no-display))
+(declare-function notmuch-poll "notmuch-lib" ())
(declare-function notmuch-tree "notmuch-tree"
- (&optional query query-context target buffer-name open-target unthreaded))
-(declare-function notmuch-unthreaded
- (&optional query query-context target buffer-name open-target))
+ (&optional query query-context target buffer-name
+ open-target unthreaded parent-buffer))
+(declare-function notmuch-unthreaded "notmuch-tree"
+ (&optional query query-context target buffer-name
+ open-target))
;;; Options
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index ba93febb..9ac1a8bd 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -39,19 +39,20 @@
(require 'notmuch-print)
(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-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-count-attachments "notmuch" (mm-handle))
(declare-function notmuch-save-attachments "notmuch" (mm-handle &optional queryp))
(declare-function notmuch-tree "notmuch-tree"
(&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-unthreaded
- (&optional query query-context target buffer-name open-target))
+(declare-function notmuch-unthreaded "notmuch-tree"
+ (&optional query query-context target buffer-name
+ open-target))
(declare-function notmuch-read-query "notmuch" (prompt))
(declare-function notmuch-draft-resume "notmuch-draft" (id))
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 13007a13..00ee78d6 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -34,8 +34,9 @@
(require 'notmuch-jump)
(declare-function notmuch-search "notmuch"
- (&optional query oldest-first target-thread target-line))
-(declare-function notmuch-call-notmuch-process "notmuch" (&rest args))
+ (&optional query oldest-first target-thread target-line
+ no-display))
+(declare-function notmuch-call-notmuch-process "notmuch-lib" (&rest args))
(declare-function notmuch-read-query "notmuch" (prompt))
(declare-function notmuch-search-find-thread-id "notmuch" (&optional bare))
(declare-function notmuch-search-find-subject "notmuch" ())
@@ -1112,7 +1113,8 @@ (defun notmuch-tree-get-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.
The arguments are:
@@ -1145,7 +1147,8 @@ (defun notmuch-tree (&optional query query-context target buffer-name open-targe
(setq notmuch-tree-parent-buffer parent-buffer)
(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)
(notmuch-tree query query-context target buffer-name open-target t))
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 26efcccd..60a86a69 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -973,7 +973,8 @@ (defun notmuch-search-get-query ()
(put 'notmuch-search 'notmuch-doc "Search for messages.")
;;;###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.
If QUERY is nil, it is read interactively from the minibuffer.
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/3] emacs: fix declare-function definitions with related line breaks
2021-01-16 17:17 [PATCH 1/3] emacs: fix declare-function definitions with related line breaks Tomi Ollila
@ 2021-06-07 23:34 ` David Bremner
0 siblings, 0 replies; 2+ messages in thread
From: David Bremner @ 2021-06-07 23:34 UTC (permalink / raw)
To: Tomi Ollila, notmuch; +Cc: tomi.ollila
Tomi Ollila <tomi.ollila@iki.fi> writes:
> - 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")
Applied to master. I did note that we have relaxed the line length for
the C code, but maybe the shorter length still makes sense for elisp?
d
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-07 23:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-16 17:17 [PATCH 1/3] emacs: fix declare-function definitions with related line breaks Tomi Ollila
2021-06-07 23:34 ` David Bremner
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).