unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Jonas Bernoulli <jonas@bernoul.li>
To: notmuch@notmuchmail.org
Subject: [PATCH v3 18/34] emacs: Various cosmetic changes
Date: Sat,  8 Aug 2020 13:49:53 +0200	[thread overview]
Message-ID: <20200808115009.24071-19-jonas@bernoul.li> (raw)
In-Reply-To: <20200808115009.24071-1-jonas@bernoul.li>

---
 emacs/make-deps.el      |  3 ++-
 emacs/notmuch-lib.el    |  8 +++-----
 emacs/notmuch-parser.el |  9 +++------
 emacs/notmuch-show.el   | 18 +++++++-----------
 emacs/rstdoc.el         |  9 ++++-----
 test/test-lib.el        | 31 +++++++++++++++----------------
 6 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/emacs/make-deps.el b/emacs/make-deps.el
index dcac319c..91f4ef3d 100644
--- a/emacs/make-deps.el
+++ b/emacs/make-deps.el
@@ -36,7 +36,8 @@ (defun make-deps (&optional dir)
 This prints make dependencies to `standard-output' based on the
 top-level `require' expressions in the current buffer.  Paths in
 rules will be given relative to DIR, or `default-directory'."
-  (setq dir (or dir default-directory))
+  (unless dir
+    (setq dir default-directory))
   (save-excursion
     (goto-char (point-min))
     (condition-case nil
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index b86c44ed..05d86ea1 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -53,9 +53,8 @@ (defgroup notmuch-show nil
 
 (defgroup notmuch-send nil
   "Sending messages from Notmuch."
-  :group 'notmuch)
-
-(custom-add-to-group 'notmuch-send 'message 'custom-group)
+  :group 'notmuch
+  :group 'message)
 
 (defgroup notmuch-tag nil
   "Tags and tagging in Notmuch."
@@ -782,8 +781,7 @@ (defun notmuch-logged-error (msg &optional extra)
 	(insert extra)
 	(unless (bolp)
 	  (newline)))))
-  (error "%s"
-	 (concat msg (and extra " (see *Notmuch errors* for more details)"))))
+  (error "%s%s" msg (if extra " (see *Notmuch errors* for more details)" "")))
 
 (defun notmuch-check-async-exit-status (proc msg &optional command err)
   "If PROC exited abnormally, pop up an error buffer and signal an error.
diff --git a/emacs/notmuch-parser.el b/emacs/notmuch-parser.el
index fbcfc2ef..3aa5bd8f 100644
--- a/emacs/notmuch-parser.el
+++ b/emacs/notmuch-parser.el
@@ -39,12 +39,9 @@ (defun notmuch-sexp-create-parser ()
 buffer.  Hence, the caller is allowed to delete any data before
 point and may resynchronize after an error by moving point."
   (vector 'notmuch-sexp-parser
-	  ;; List depth
-	  0
-	  ;; Partial parse position marker
-	  nil
-	  ;; Partial parse state
-	  nil))
+	  0     ; List depth
+	  nil   ; Partial parse position marker
+	  nil)) ; Partial parse state
 
 (defmacro notmuch-sexp--depth (sp)         `(aref ,sp 1))
 (defmacro notmuch-sexp--partial-pos (sp)   `(aref ,sp 2))
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 015edb0c..5640346f 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -499,21 +499,17 @@ (define-button-type 'notmuch-show-part-button-type
 
 (defun notmuch-show-insert-part-header (nth content-type declared-type
 					    &optional name comment)
-  (let ((button)
-	(base-label (concat (and name (concat name ": "))
+  (let ((base-label (concat (and name (concat name ": "))
 			    declared-type
 			    (and (not (string-equal declared-type content-type))
 				 (concat " (as " content-type ")"))
 			    comment)))
-    (setq button
-	  (insert-button
-	   (concat "[ " base-label " ]")
-	   :base-label base-label
-	   :type 'notmuch-show-part-button-type
-	   :notmuch-part-hidden nil))
-    (insert "\n")
-    ;; return button
-    button))
+    (prog1 (insert-button
+	    (concat "[ " base-label " ]")
+	    :base-label base-label
+	    :type 'notmuch-show-part-button-type
+	    :notmuch-part-hidden nil)
+      (insert "\n"))))
 
 (defun notmuch-show-toggle-part-invisibility (&optional button)
   (interactive)
diff --git a/emacs/rstdoc.el b/emacs/rstdoc.el
index 92a337c8..41390bbe 100644
--- a/emacs/rstdoc.el
+++ b/emacs/rstdoc.el
@@ -24,7 +24,6 @@
 ;;
 
 ;;; Commentary:
-;;
 
 ;; Rstdoc provides a facility to extract all of the docstrings defined in
 ;; an elisp source file. Usage:
@@ -68,10 +67,10 @@ (defun rstdoc--insert-docstring (symbol docstring)
   (insert "\n"))
 
 (defvar rst--escape-alist
-  '( ("\\\\='" . "\\\\'")
-     ("\\([^\\]\\)'" . "\\1`")
-     ("^[[:space:]\t]*$" . "|br|")
-     ("^[[:space:]\t]" . "|indent| "))
+  '(("\\\\='" . "\\\\'")
+    ("\\([^\\]\\)'" . "\\1`")
+    ("^[[:space:]\t]*$" . "|br|")
+    ("^[[:space:]\t]" . "|indent| "))
   "List of (regex . replacement) pairs.")
 
 (defun rstdoc--rst-quote-string (str)
diff --git a/test/test-lib.el b/test/test-lib.el
index 6a39bbe2..e9e7c379 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -154,22 +154,21 @@ (defun notmuch-test-report-unexpected (output expected)
 
 (defun notmuch-test-expect-equal (output expected)
   "Compare OUTPUT with EXPECTED. Report any discrepencies."
-  (if (equal output expected)
-      t
-    (cond
-     ((and (listp output)
-	   (listp expected))
-      ;; Reporting the difference between two lists is done by
-      ;; reporting differing elements of OUTPUT and EXPECTED
-      ;; pairwise. This is expected to make analysis of failures
-      ;; simpler.
-      (apply #'concat (cl-loop for o in output
-			       for e in expected
-			       if (not (equal o e))
-			       collect (notmuch-test-report-unexpected o e))))
-
-     (t
-      (notmuch-test-report-unexpected output expected)))))
+  (cond
+   ((equal output expected)
+    t)
+   ((and (listp output)
+	 (listp expected))
+    ;; Reporting the difference between two lists is done by
+    ;; reporting differing elements of OUTPUT and EXPECTED
+    ;; pairwise. This is expected to make analysis of failures
+    ;; simpler.
+    (apply #'concat (cl-loop for o in output
+			     for e in expected
+			     if (not (equal o e))
+			     collect (notmuch-test-report-unexpected o e))))
+   (t
+    (notmuch-test-report-unexpected output expected))))
 
 (defun notmuch-post-command ()
   (run-hooks 'post-command-hook))
-- 
2.28.0

  parent reply	other threads:[~2020-08-08 11:52 UTC|newest]

Thread overview: 108+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-26 16:57 [PATCH 00/23] A create number of cosmetic changes Jonas Bernoulli
2020-07-26 16:57 ` [PATCH 01/23] emacs: Shorten long lines Jonas Bernoulli
2020-07-27 17:52   ` Tomi Ollila
2020-07-27 20:13     ` Jonas Bernoulli
2020-07-26 16:57 ` [PATCH 02/23] emacs: Remove excess empty lines Jonas Bernoulli
2020-07-27 18:00   ` Tomi Ollila
2020-07-27 20:25     ` Jonas Bernoulli
2020-07-26 16:57 ` [PATCH 03/23] emacs: Fix indentation Jonas Bernoulli
2020-07-30 20:07   ` Tomi Ollila
2020-08-01 20:37     ` Jonas Bernoulli
2020-07-26 16:57 ` [PATCH 04/23] emacs: Closing parenthesis go on the same line Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 05/23] emacs: Only set one variable per setq form Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 06/23] emacs: Use cl-incf where appropriate Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 07/23] emacs: Use 'and' instead of 'when' when the return value matters Jonas Bernoulli
2020-07-26 21:27   ` Sean Whitton
2020-07-26 22:02     ` Jonas Bernoulli
2020-07-27 16:43       ` Sean Whitton
2020-07-27 20:32         ` Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 08/23] emacs: Use 'unless' instead of 'when' and 'not' Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 09/23] emacs: Use 'when' instead of 'if' when there is no ELSE part Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 10/23] emacs: Use one or three lines for 'if' forms Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 11/23] emacs: Extend face to window edge again Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 12/23] emacs: Fix some function declarations Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 13/23] emacs: No longer define notmuch-hello-mode-map as a function Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 14/23] emacs: notmuch-poll: Let the user know we are polling Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 15/23] emacs: Use makefile-gmake-mode in Makefile*s Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 16/23] emacs: Improve doc-strings Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 17/23] emacs: Autoload notmuch-jump-search only once Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 18/23] emacs: Autoload notmuch-jump using an autoload cookie Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 19/23] emacs: Various cosmetic changes Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 20/23] emacs: Increase consistency of library headers Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 21/23] Fix typos Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 22/23] .dir-locals.el: Set variables for correct "shell" mode Jonas Bernoulli
2020-07-26 16:58 ` [PATCH 23/23] test: Fix indentation Jonas Bernoulli
2020-07-30 20:36 ` [PATCH 00/23] A create number of cosmetic changes Tomi Ollila
2020-08-01 20:48   ` [PATCH 00/23] A great " Jonas Bernoulli
2020-08-03 17:32     ` David Bremner
2020-08-06  7:18 ` [PATCH v2 " Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 01/23] emacs: Shorten long lines Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 02/23] emacs: Remove excess empty lines Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 03/23] emacs: Fix indentation Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 04/23] emacs: Closing parenthesis go on the same line Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 05/23] emacs: Only set one variable per setq form Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 06/23] emacs: Use cl-incf where appropriate Jonas Bernoulli
2020-08-06 11:37     ` David Bremner
2020-08-06 13:37       ` Jonas Bernoulli
2020-08-07 17:03         ` Tomi Ollila
2020-08-07 17:22           ` David Bremner
2020-08-06  7:18   ` [PATCH v2 07/23] emacs: Use 'and' instead of 'when' when the return value matters Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 08/23] emacs: Use 'unless' instead of 'when' and 'not' Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 09/23] emacs: Use 'when' instead of 'if' when there is no ELSE part Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 10/23] emacs: Use one or three lines for 'if' forms Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 11/23] emacs: Extend face to window edge again Jonas Bernoulli
2020-08-06  7:18   ` [PATCH v2 12/23] emacs: Fix some function declarations Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 13/23] emacs: No longer define notmuch-hello-mode-map as a function Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 14/23] emacs: notmuch-poll: Let the user know we are polling Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 15/23] emacs: Use makefile-gmake-mode in Makefile*s Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 16/23] emacs: Improve doc-strings Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 17/23] emacs: Autoload notmuch-jump-search only once Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 18/23] emacs: Autoload notmuch-jump using an autoload cookie Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 19/23] emacs: Various cosmetic changes Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 20/23] emacs: Increase consistency of library headers Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 21/23] Fix typos Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 22/23] .dir-locals.el: Set variables for correct "shell" mode Jonas Bernoulli
2020-08-06  7:19   ` [PATCH v2 23/23] test: Fix indentation Jonas Bernoulli
2020-08-08 11:49 ` [PATCH v3 00/34] A great number of cosmetic changes Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 01/34] emacs: Shorten long lines Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 02/34] emacs: Remove excess empty lines Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 03/34] emacs: Fix indentation Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 04/34] emacs: Closing parenthesis go on the same line Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 05/34] emacs: Only set one variable per setq form Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 06/34] emacs: Use 'and' instead of 'when' when the return value matters Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 07/34] emacs: Use 'unless' instead of 'when' and 'not' Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 08/34] emacs: Use 'when' instead of 'if' when there is no ELSE part Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 09/34] emacs: Use one or three lines for 'if' forms Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 10/34] emacs: Extend face to window edge again Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 11/34] emacs: Fix some function declarations Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 12/34] emacs: No longer define notmuch-hello-mode-map as a function Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 13/34] emacs: notmuch-poll: Let the user know we are polling Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 14/34] emacs: Use makefile-gmake-mode in Makefile*s Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 15/34] emacs: Improve doc-strings Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 16/34] emacs: Autoload notmuch-jump-search only once Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 17/34] emacs: Autoload notmuch-jump using an autoload cookie Jonas Bernoulli
2020-08-08 11:49   ` Jonas Bernoulli [this message]
2020-08-08 11:49   ` [PATCH v3 19/34] emacs: Increase consistency of library headers Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 20/34] Fix typos Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 21/34] .dir-locals.el: Set variables for correct "shell" mode Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 22/34] test: Fix indentation Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 23/34] .gitignore: Sort using sort-lines Jonas Bernoulli
2020-08-08 11:49   ` [PATCH v3 24/34] emacs: Provide 'rstdoc' feature at end of file Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 25/34] emacs: Add end-of-file line to libraries that lack it Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 26/34] NEWS: Add stub for 0.31 Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 27/34] NEWS: At least Emacs 25.1 is required now Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 28/34] emacs: Use cl-incf where appropriate Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 29/34] emacs: Remove notmuch-setq-local Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 30/34] emacs: Remove notmuch-read-char-choice Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 31/34] emacs: Drop old advices that were only need for Emacs 23 Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 32/34] emacs: Do not abuse advice to monkey patch while testing Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 33/34] emacs: Use new advice mechanism do advice mm-shr Jonas Bernoulli
2020-08-08 11:50   ` [PATCH v3 34/34] try-emacs-mua: Trim `require' advice for Emacs 25 Jonas Bernoulli
2020-08-09  7:15   ` [PATCH v3 00/34] A great number of cosmetic changes Tomi Ollila
2020-08-09  7:48     ` Jonas Bernoulli
2020-08-09 12:09   ` David Bremner
2020-08-09 12:41     ` Đoàn Trần Công Danh
2020-08-09 13:21       ` Jonas Bernoulli
2020-08-09 13:32     ` Jonas Bernoulli
2020-08-09 14:49     ` Tomi Ollila
2020-08-10  1:25       ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200808115009.24071-19-jonas@bernoul.li \
    --to=jonas@bernoul.li \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).