On Thu, 12 Jan 2012 18:33:06 +0100, Pieter Praet <pieter at praet.org> wrote: > Less code, same results, without sacrificing readability. >
+1 Regards, Dmitry > --- > emacs/notmuch-address.el | 6 +++--- > emacs/notmuch-hello.el | 20 ++++++++++---------- > emacs/notmuch-show.el | 12 ++++++------ > emacs/notmuch.el | 8 ++++---- > 4 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el > index 8eba7a0..d72b169 100644 > --- a/emacs/notmuch-address.el > +++ b/emacs/notmuch-address.el > @@ -37,9 +37,9 @@ line." > (defvar notmuch-address-history nil) > > (defun notmuch-address-message-insinuate () > - (if (not (memq notmuch-address-message-alist-member > message-completion-alist)) > - (setq message-completion-alist > - (push notmuch-address-message-alist-member > message-completion-alist)))) > + (unless (memq notmuch-address-message-alist-member > message-completion-alist) > + (setq message-completion-alist > + (push notmuch-address-message-alist-member > message-completion-alist)))) > > (defun notmuch-address-options (original) > (process-lines notmuch-address-command original)) > diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el > index 333d4c1..dce2020 100644 > --- a/emacs/notmuch-hello.el > +++ b/emacs/notmuch-hello.el > @@ -315,7 +315,7 @@ 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 (not (eq (% count tags-per-line) 0)) > + (unless (eq (% count tags-per-line) 0) > (widget-insert "\n")) > found-target-pos)) > > @@ -399,7 +399,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. > - (if (not notmuch-saved-searches) > + (unless notmuch-saved-searches > (setq notmuch-saved-searches (notmuch-saved-searches))) > > (if no-display > @@ -565,18 +565,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)) > - (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") > > - (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") > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el > index 5502efd..d3543f0 100644 > --- a/emacs/notmuch-show.el > +++ b/emacs/notmuch-show.el > @@ -659,8 +659,8 @@ current buffer, if possible." > ;; part, so we make sure that we're down at the end. > (goto-char (point-max)) > ;; Ensure that the part ends with a carriage return. > - (if (not (bolp)) > - (insert "\n"))) > + (unless (bolp) > + (insert "\n"))) > > (defun notmuch-show-insert-body (msg body depth) > "Insert the body BODY at depth DEPTH in the current thread." > @@ -740,8 +740,8 @@ current buffer, if possible." > (setq body-start (point-marker)) > (notmuch-show-insert-body msg (plist-get msg :body) depth) > ;; Ensure that the body ends with a newline. > - (if (not (bolp)) > - (insert "\n")) > + (unless (bolp) > + (insert "\n")) > (setq body-end (point-marker)) > (setq content-end (point-marker)) > > @@ -882,8 +882,8 @@ buffer." > (run-hooks 'notmuch-show-hook)) > > ;; Move straight to the first open message > - (if (not (notmuch-show-message-visible-p)) > - (notmuch-show-next-open-message)) > + (unless (notmuch-show-message-visible-p) > + (notmuch-show-next-open-message)) > > ;; Set the header line to the subject of the first open message. > (setq header-line-format (notmuch-show-strip-re > (notmuch-show-get-subject))) > diff --git a/emacs/notmuch.el b/emacs/notmuch.el > index 1e61775..ba84494 100644 > --- a/emacs/notmuch.el > +++ b/emacs/notmuch.el > @@ -636,8 +636,8 @@ This function advances the next thread when finished." > (if notmuch-search-process-filter-data > (insert (concat "Error: Unexpected output from > notmuch search:\n" notmuch-search-process-filter-data))) > (insert "End of search results.") > - (if (not (= exit-status 0)) > - (insert (format " (process returned %d)" > exit-status))) > + (unless (= exit-status 0) > + (insert (format " (process returned %d)" > exit-status))) > (insert "\n") > (if (and atbob > (not (string= notmuch-search-target-thread > "found"))) > @@ -1006,8 +1006,8 @@ Invokes `notmuch-poll-script', \"notmuch new\", or does > nothing > depending on the value of `notmuch-poll-script'." > (interactive) > (if (stringp notmuch-poll-script) > - (if (not (string= notmuch-poll-script "")) > - (call-process notmuch-poll-script nil nil)) > + (unless (string= notmuch-poll-script "") > + (call-process notmuch-poll-script nil nil)) > (call-process notmuch-command nil nil nil "new"))) > > (defun notmuch-search-poll-and-refresh-view () > -- > 1.7.8.1 > > _______________________________________________ > notmuch mailing list > notmuch at notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch
