emacs: globally replace non-branching "(if (not ..." with "(unless ..."

[notmuch] / emacs / notmuch-hello.el

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 2f7e17dc0aed79bd6c614768cd35bfcd57ef2fd8..ba48cd639467e94f824617034ac87c68169dfdd6 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -35,12 +35,12 @@
 (defcustom notmuch-recent-searches-max 10
   "The number of recent searches to store and display."
   :type 'integer
 (defcustom notmuch-recent-searches-max 10
   "The number of recent searches to store and display."
   :type 'integer

-  :group 'notmuch)
+  :group 'notmuch-hello)

 
 (defcustom notmuch-show-empty-saved-searches nil
   "Should saved searches with no messages be listed?"
   :type 'boolean
 
 (defcustom notmuch-show-empty-saved-searches nil
   "Should saved searches with no messages be listed?"
   :type 'boolean

-  :group 'notmuch)
+  :group 'notmuch-hello)

 
 (defun notmuch-sort-saved-searches (alist)
   "Generate an alphabetically sorted saved searches alist."
 
 (defun notmuch-sort-saved-searches (alist)
   "Generate an alphabetically sorted saved searches alist."


@@ -60,7 +60,7 @@ alist to be used."
                 (const :tag "Sort alphabetically" notmuch-sort-saved-searches)
                 (function :tag "Custom sort function"
                           :value notmuch-sort-saved-searches))
                 (const :tag "Sort alphabetically" notmuch-sort-saved-searches)
                 (function :tag "Custom sort function"
                           :value notmuch-sort-saved-searches))

-  :group 'notmuch)
+  :group 'notmuch-hello)

 
 (defvar notmuch-hello-indent 4
   "How much to indent non-headers.")
 
 (defvar notmuch-hello-indent 4
   "How much to indent non-headers.")


@@ -68,12 +68,12 @@ alist to be used."
 (defcustom notmuch-show-logo t
   "Should the notmuch logo be shown?"
   :type 'boolean
 (defcustom notmuch-show-logo t
   "Should the notmuch logo be shown?"
   :type 'boolean

-  :group 'notmuch)
+  :group 'notmuch-hello)

 
 (defcustom notmuch-show-all-tags-list nil
   "Should all tags be shown in the notmuch-hello view?"
   :type 'boolean
 
 (defcustom notmuch-show-all-tags-list nil
   "Should all tags be shown in the notmuch-hello view?"
   :type 'boolean

-  :group 'notmuch)
+  :group 'notmuch-hello)

 
 (defcustom notmuch-hello-tag-list-make-query nil
   "Function or string to generate queries for the all tags list.
 
 (defcustom notmuch-hello-tag-list-make-query nil
   "Function or string to generate queries for the all tags list.


@@ -89,12 +89,12 @@ should return a filter for that tag, or nil to hide the tag."
                 (string :tag "Custom filter"
                         :value "tag:unread")
                 (function :tag "Custom filter function"))
                 (string :tag "Custom filter"
                         :value "tag:unread")
                 (function :tag "Custom filter function"))

-  :group 'notmuch)
+  :group 'notmuch-hello)

 
 (defcustom notmuch-hello-hide-tags nil
   "List of tags to be hidden in the \"all tags\"-section."
   :type '(repeat string)
 
 (defcustom notmuch-hello-hide-tags nil
   "List of tags to be hidden in the \"all tags\"-section."
   :type '(repeat string)

-  :group 'notmuch)
+  :group 'notmuch-hello)

 
 (defface notmuch-hello-logo-background
   '((((class color)
 
 (defface notmuch-hello-logo-background
   '((((class color)


@@ -104,7 +104,8 @@ should return a filter for that tag, or nil to hide the tag."
       (background light))
      (:background "white")))
   "Background colour for the notmuch logo."
       (background light))
      (:background "white")))
   "Background colour for the notmuch logo."

-  :group 'notmuch)
+  :group 'notmuch-hello
+  :group 'notmuch-faces)

 
 (defcustom notmuch-column-control t
   "Controls the number of columns for saved searches/tags in notmuch view.
 
 (defcustom notmuch-column-control t
   "Controls the number of columns for saved searches/tags in notmuch view.


@@ -126,11 +127,11 @@ So:
   30.
 - if you don't want to worry about all of this nonsense, leave
   this set to `t'."
   30.
 - if you don't want to worry about all of this nonsense, leave
   this set to `t'."

-  :group 'notmuch

   :type '(choice
          (const :tag "Automatically calculated" t)
          (integer :tag "Number of characters")
   :type '(choice
          (const :tag "Automatically calculated" t)
          (integer :tag "Number of characters")

-         (float :tag "Fraction of window")))
+         (float :tag "Fraction of window"))
+  :group 'notmuch-hello)

 
 (defcustom notmuch-hello-thousands-separator " "
   "The string used as a thousands separator.
 
 (defcustom notmuch-hello-thousands-separator " "
   "The string used as a thousands separator.


@@ -138,18 +139,20 @@ So:
 Typically \",\" in the US and UK and \".\" or \" \" in Europe.
 The latter is recommended in the SI/ISO 31-0 standard and by the
 International Bureau of Weights and Measures."
 Typically \",\" in the US and UK and \".\" or \" \" in Europe.
 The latter is recommended in the SI/ISO 31-0 standard and by the
 International Bureau of Weights and Measures."

-  :group 'notmuch
-  :type 'string)
+  :type 'string
+  :group 'notmuch-hello)

 
 (defcustom notmuch-hello-mode-hook nil
   "Functions called after entering `notmuch-hello-mode'."
 
 (defcustom notmuch-hello-mode-hook nil
   "Functions called after entering `notmuch-hello-mode'."

-  :group 'notmuch
-  :type 'hook)
+  :type 'hook
+  :group 'notmuch-hello
+  :group 'notmuch-hooks)

 
 (defcustom notmuch-hello-refresh-hook nil
   "Functions called after updating a `notmuch-hello' buffer."
   :type 'hook
 
 (defcustom notmuch-hello-refresh-hook nil
   "Functions called after updating a `notmuch-hello' buffer."
   :type 'hook

-  :group 'notmuch)
+  :group 'notmuch-hello
+  :group 'notmuch-hooks)

 
 (defvar notmuch-hello-url "http://notmuchmail.org"
   "The `notmuch' web site.")
 
 (defvar notmuch-hello-url "http://notmuchmail.org"
   "The `notmuch' web site.")


@@ -157,8 +160,9 @@ International Bureau of Weights and Measures."
 (defvar notmuch-hello-recent-searches nil)
 
 (defun notmuch-hello-remember-search (search)
 (defvar notmuch-hello-recent-searches nil)
 
 (defun notmuch-hello-remember-search (search)

-  (if (not (member search notmuch-hello-recent-searches))
-      (push search notmuch-hello-recent-searches))
+  (setq notmuch-hello-recent-searches
+       (delete search notmuch-hello-recent-searches))
+  (push search notmuch-hello-recent-searches)

   (if (> (length notmuch-hello-recent-searches)
         notmuch-recent-searches-max)
       (setq notmuch-hello-recent-searches (butlast notmuch-hello-recent-searches))))
   (if (> (length notmuch-hello-recent-searches)
         notmuch-recent-searches-max)
       (setq notmuch-hello-recent-searches (butlast notmuch-hello-recent-searches))))


@@ -298,15 +302,17 @@ should be. Returns a cons cell `(tags-per-line width)'."
                               :notify #'notmuch-hello-widget-search
                               :notmuch-search-terms query
                               formatted-name)
                               :notify #'notmuch-hello-widget-search
                               :notmuch-search-terms query
                               formatted-name)

-               ;; Insert enough space to consume the rest of the
-               ;; column.  Because the button for the name is `(1+
-               ;; (length name))' long (due to the trailing space) we
-               ;; can just insert `(- widest (length name))' spaces -
-               ;; the column separator is included in the button if
-               ;; `(equal widest (length name)'.
-               (widget-insert (make-string (max 1
-                                                (- widest (length name)))
-                                           ? ))))
+               (unless (eq (% count tags-per-line) (1- tags-per-line))
+                 ;; If this is not the last tag on the line, insert
+                 ;; enough space to consume the rest of the column.
+                 ;; Because the button for the name is `(1+ (length
+                 ;; name))' long (due to the trailing space) we can
+                 ;; just insert `(- widest (length name))' spaces - the
+                 ;; column separator is included in the button if
+                 ;; `(equal widest (length name)'.
+                 (widget-insert (make-string (max 1
+                                                  (- widest (length name)))
+                                             ? )))))

            (setq count (1+ count))
            (if (eq (% count tags-per-line) 0)
                (widget-insert "\n")))
            (setq count (1+ count))
            (if (eq (% count tags-per-line) 0)
                (widget-insert "\n")))


@@ -314,8 +320,8 @@ should be. Returns a cons cell `(tags-per-line width)'."
 
     ;; If the last line was not full (and hence did not include a
     ;; carriage return), insert one now.
 
     ;; If the last line was not full (and hence did not include a
     ;; carriage return), insert one now.

-    (if (not (eq (% count tags-per-line) 0))
-       (widget-insert "\n"))
+    (unless (eq (% count tags-per-line) 0)
+      (widget-insert "\n"))

     found-target-pos))
 
 (defun notmuch-hello-goto-search ()
     found-target-pos))
 
 (defun notmuch-hello-goto-search ()


@@ -398,7 +404,7 @@ Complete list of currently available key bindings:
 
   ; Jump through a hoop to get this value from the deprecated variable
   ; name (`notmuch-folders') or from the default value.
 
   ; Jump through a hoop to get this value from the deprecated variable
   ; name (`notmuch-folders') or from the default value.

-  (if (not notmuch-saved-searches)
+  (unless notmuch-saved-searches

     (setq notmuch-saved-searches (notmuch-saved-searches)))
 
   (if no-display
     (setq notmuch-saved-searches (notmuch-saved-searches)))
 
   (if no-display


@@ -564,18 +570,18 @@ Complete list of currently available key bindings:
          (widget-insert "\n\n")
          (let ((start (point)))
            (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target))
          (widget-insert "\n\n")
          (let ((start (point)))
            (setq found-target-pos (notmuch-hello-insert-tags alltags-alist widest target))

-           (if (not final-target-pos)
-               (setq final-target-pos found-target-pos))
+           (unless final-target-pos
+             (setq final-target-pos found-target-pos))

            (indent-rigidly start (point) notmuch-hello-indent)))
 
        (widget-insert "\n")
 
            (indent-rigidly start (point) notmuch-hello-indent)))
 
        (widget-insert "\n")
 

-       (if (not notmuch-show-all-tags-list)
-           (widget-create 'push-button
-                          :notify (lambda (widget &rest ignore)
-                                    (setq notmuch-show-all-tags-list t)
-                                    (notmuch-hello-update))
-                          "Show all tags")))
+       (unless notmuch-show-all-tags-list
+         (widget-create 'push-button
+                        :notify (lambda (widget &rest ignore)
+                                  (setq notmuch-show-all-tags-list t)
+                                  (notmuch-hello-update))
+                        "Show all tags")))

 
       (let ((start (point)))
        (widget-insert "\n\n")
 
       (let ((start (point)))
        (widget-insert "\n\n")