emacs: Increase consistency of library headers

[notmuch] / emacs / notmuch-lib.el

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index da48bb86602dda774ea9f8bdb9725f13e7a48908..fded2d7b20dc19437eb155b20ca515583d6a77fb 100644 (file)
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -19,8 +19,6 @@
 ;;
 ;; Authors: Carl Worth <cworth@cworth.org>
 
 ;;
 ;; Authors: Carl Worth <cworth@cworth.org>
 

-;; This is an part of an emacs-based interface to the notmuch mail system.
-

 ;;; Code:
 
 (require 'cl-lib)
 ;;; Code:
 
 (require 'cl-lib)


@@ -35,9 +33,6 @@
   (defconst notmuch-emacs-version "unknown"
     "Placeholder variable when notmuch-version.el[c] is not available."))
 
   (defconst notmuch-emacs-version "unknown"
     "Placeholder variable when notmuch-version.el[c] is not available."))
 

-(autoload 'notmuch-jump-search "notmuch-jump"
-  "Jump to a saved search by shortcut key." t)
-

 (defgroup notmuch nil
   "Notmuch mail reader for Emacs."
   :group 'mail)
 (defgroup notmuch nil
   "Notmuch mail reader for Emacs."
   :group 'mail)


@@ -56,9 +51,8 @@
 
 (defgroup notmuch-send nil
   "Sending messages from Notmuch."
 
 (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."
 
 (defgroup notmuch-tag nil
   "Tags and tagging in Notmuch."


@@ -259,11 +253,13 @@ on the command line, and then retry your notmuch command")))
 Invokes `notmuch-poll-script', \"notmuch new\", or does nothing
 depending on the value of `notmuch-poll-script'."
   (interactive)
 Invokes `notmuch-poll-script', \"notmuch new\", or does nothing
 depending on the value of `notmuch-poll-script'."
   (interactive)

+  (message "Polling mail...")

   (if (stringp notmuch-poll-script)
       (unless (string= notmuch-poll-script "")
        (unless (equal (call-process notmuch-poll-script nil nil) 0)
          (error "Notmuch: poll script `%s' failed!" notmuch-poll-script)))
   (if (stringp notmuch-poll-script)
       (unless (string= notmuch-poll-script "")
        (unless (equal (call-process notmuch-poll-script nil nil) 0)
          (error "Notmuch: poll script `%s' failed!" notmuch-poll-script)))

-    (notmuch-call-notmuch-process "new")))
+    (notmuch-call-notmuch-process "new"))
+  (message "Polling mail...done"))

 
 (defun notmuch-bury-or-kill-this-buffer ()
   "Undisplay the current buffer.
 
 (defun notmuch-bury-or-kill-this-buffer ()
   "Undisplay the current buffer.


@@ -611,7 +607,8 @@ the given type."
                                   ,@(and process-crypto '("--decrypt=true"))
                                   ,(notmuch-id-to-query (plist-get msg :id))))
                           (coding-system-for-read
                                   ,@(and process-crypto '("--decrypt=true"))
                                   ,(notmuch-id-to-query (plist-get msg :id))))
                           (coding-system-for-read

-                           (if binaryp 'no-conversion
+                           (if binaryp
+                               'no-conversion

                              (let ((coding-system
                                     (mm-charset-to-coding-system
                                      (plist-get part :content-charset))))
                              (let ((coding-system
                                     (mm-charset-to-coding-system
                                      (plist-get part :content-charset))))


@@ -680,7 +677,8 @@ current buffer, if possible."
       ;; `gnus-decoded' charset.  Otherwise, we'll fetch the binary
       ;; part content and let mm-* decode it.
       (let* ((have-content (plist-member part :content))
       ;; `gnus-decoded' charset.  Otherwise, we'll fetch the binary
       ;; part content and let mm-* decode it.
       (let* ((have-content (plist-member part :content))

-            (charset (if have-content 'gnus-decoded
+            (charset (if have-content
+                         'gnus-decoded

                        (plist-get part :content-charset)))
             (handle (mm-make-handle (current-buffer)
                                     `(,content-type (charset . ,charset)))))
                        (plist-get part :content-charset)))
             (handle (mm-make-handle (current-buffer)
                                     `(,content-type (charset . ,charset)))))


@@ -781,8 +779,7 @@ signaled error.  This function does not return."
        (insert extra)
        (unless (bolp)
          (newline)))))
        (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.
 
 (defun notmuch-check-async-exit-status (proc msg &optional command err)
   "If PROC exited abnormally, pop up an error buffer and signal an error.