From e3260d025389c2e98dbda58cff1c214497813bc2 Mon Sep 17 00:00:00 2001 From: Aaron Ecay Date: Sat, 17 Dec 2011 10:47:48 -0500 Subject: [PATCH] Don't quote lambda forms This generates byte-compiler warnings on (at least) current trunk versions of Emacs. The quote is not necessary; lambda forms are self-quoting. --- emacs/notmuch-crypto.el | 4 +-- emacs/notmuch-hello.el | 64 ++++++++++++++++++------------------ emacs/notmuch-maildir-fcc.el | 12 +++---- emacs/notmuch-message.el | 8 ++--- emacs/notmuch-show.el | 20 +++++------ emacs/notmuch.el | 20 +++++------ 6 files changed, 64 insertions(+), 64 deletions(-) diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el index 67c26af9..ac300987 100644 --- a/emacs/notmuch-crypto.el +++ b/emacs/notmuch-crypto.el @@ -68,7 +68,7 @@ mode." :group 'notmuch) (define-button-type 'notmuch-crypto-status-button-type - 'action '(lambda (button) (message (button-get button 'help-echo))) + 'action (lambda (button) (message (button-get button 'help-echo))) 'follow-link t 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.") @@ -77,7 +77,7 @@ mode." (help-msg nil) (label "Signature not processed") (face 'notmuch-crypto-signature-unknown) - (button-action '(lambda (button) (message (button-get button 'help-echo))))) + (button-action (lambda (button) (message (button-get button 'help-echo))))) (cond ((string= status "good") (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint)))) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 81b26059..45cda2ec 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -336,8 +336,8 @@ should be. Returns a cons cell `(tags-per-line width)'." (defvar notmuch-hello-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map widget-keymap) - (define-key map "v" '(lambda () "Display the notmuch version" (interactive) - (message "notmuch version %s" (notmuch-version)))) + (define-key map "v" (lambda () "Display the notmuch version" (interactive) + (message "notmuch version %s" (notmuch-version)))) (define-key map "?" 'notmuch-help) (define-key map "q" 'notmuch-kill-this-buffer) (define-key map "=" 'notmuch-hello-update) @@ -513,36 +513,36 @@ Complete list of currently available key bindings: (widget-insert "\n\n") (let ((start (point)) (nth 0)) - (mapc '(lambda (search) - (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth)))) - (set widget-symbol - (widget-create 'editable-field - ;; Don't let the search boxes be - ;; less than 8 characters wide. - :size (max 8 - (- (window-width) - ;; Leave some space - ;; at the start and - ;; end of the - ;; boxes. - (* 2 notmuch-hello-indent) - ;; 1 for the space - ;; before the - ;; `[save]' button. 6 - ;; for the `[save]' - ;; button. - 1 6)) - :action (lambda (widget &rest ignore) - (notmuch-hello-search (widget-value widget))) - search)) - (widget-insert " ") - (widget-create 'push-button - :notify (lambda (widget &rest ignore) - (notmuch-hello-add-saved-search widget)) - :notmuch-saved-search-widget widget-symbol - "save")) - (widget-insert "\n") - (setq nth (1+ nth))) + (mapc (lambda (search) + (let ((widget-symbol (intern (format "notmuch-hello-search-%d" nth)))) + (set widget-symbol + (widget-create 'editable-field + ;; Don't let the search boxes be + ;; less than 8 characters wide. + :size (max 8 + (- (window-width) + ;; Leave some space + ;; at the start and + ;; end of the + ;; boxes. + (* 2 notmuch-hello-indent) + ;; 1 for the space + ;; before the + ;; `[save]' button. 6 + ;; for the `[save]' + ;; button. + 1 6)) + :action (lambda (widget &rest ignore) + (notmuch-hello-search (widget-value widget))) + search)) + (widget-insert " ") + (widget-create 'push-button + :notify (lambda (widget &rest ignore) + (notmuch-hello-add-saved-search widget)) + :notmuch-saved-search-widget widget-symbol + "save")) + (widget-insert "\n") + (setq nth (1+ nth))) notmuch-hello-recent-searches) (indent-rigidly start (point) notmuch-hello-indent))) diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index e6788685..6fbf82d2 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -65,8 +65,8 @@ yet when sending a mail." ;; Set up the message-fcc-handler to move mails to the maildir in Fcc ;; The parameter is set to mark messages as "seen" (setq message-fcc-handler-function - '(lambda (destdir) - (notmuch-maildir-fcc-write-buffer-to-maildir destdir t))) + (lambda (destdir) + (notmuch-maildir-fcc-write-buffer-to-maildir destdir t))) ;; add a hook to actually insert the Fcc header when sending (add-hook 'message-header-setup-hook 'notmuch-fcc-header-setup)) @@ -131,10 +131,10 @@ will NOT be removed or replaced." (defun notmuch-maildir-fcc-host-fixer (hostname) (replace-regexp-in-string "/\\|:" - '(lambda (s) - (cond ((string-equal s "/") "\\057") - ((string-equal s ":") "\\072") - (t s))) + (lambda (s) + (cond ((string-equal s "/") "\\057") + ((string-equal s ":") "\\072") + (t s))) hostname t t)) diff --git a/emacs/notmuch-message.el b/emacs/notmuch-message.el index aefd3fbc..08e5b174 100644 --- a/emacs/notmuch-message.el +++ b/emacs/notmuch-message.el @@ -39,10 +39,10 @@ the \"inbox\" and \"todo\", you would set (when (and notmuch-message-replied-tags rep) ;; add a "+" to any tag that is doesn't already begin with a "+" ;; or "-" - (let ((tags (mapcar '(lambda (str) - (if (not (string-match "^[+-]" str)) - (concat "+" str) - str)) + (let ((tags (mapcar (lambda (str) + (if (not (string-match "^[+-]" str)) + (concat "+" str) + str)) notmuch-message-replied-tags))) (apply 'notmuch-tag (concat "id:" (car (car rep))) tags))))) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 63b01e53..98db8f22 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -265,12 +265,12 @@ message at DEPTH in the current thread." (defun notmuch-show-insert-headers (headers) "Insert the headers of the current message." (let ((start (point))) - (mapc '(lambda (header) - (let* ((header-symbol (intern (concat ":" header))) - (header-value (plist-get headers header-symbol))) - (if (and header-value - (not (string-equal "" header-value))) - (notmuch-show-insert-header header header-value)))) + (mapc (lambda (header) + (let* ((header-symbol (intern (concat ":" header))) + (header-value (plist-get headers header-symbol))) + (if (and header-value + (not (string-equal "" header-value))) + (notmuch-show-insert-header header header-value)))) notmuch-message-headers) (save-excursion (save-restriction @@ -344,7 +344,7 @@ current buffer, if possible." )) (defun notmuch-show-multipart/*-to-list (part) - (mapcar '(lambda (inner-part) (plist-get inner-part :content-type)) + (mapcar (lambda (inner-part) (plist-get inner-part :content-type)) (plist-get part :content))) (defun notmuch-show-multipart/alternative-choose (types) @@ -657,7 +657,7 @@ current buffer, if possible." (defun notmuch-show-insert-body (msg body depth) "Insert the body BODY at depth DEPTH in the current thread." - (mapc '(lambda (part) (notmuch-show-insert-bodypart msg part depth)) body)) + (mapc (lambda (part) (notmuch-show-insert-bodypart msg part depth)) body)) (defun notmuch-show-make-symbol (type) (make-symbol (concat "notmuch-show-" type))) @@ -775,11 +775,11 @@ current buffer, if possible." (defun notmuch-show-insert-thread (thread depth) "Insert the thread THREAD at depth DEPTH in the current forest." - (mapc '(lambda (tree) (notmuch-show-insert-tree tree depth)) thread)) + (mapc (lambda (tree) (notmuch-show-insert-tree tree depth)) thread)) (defun notmuch-show-insert-forest (forest) "Insert the forest of threads FOREST." - (mapc '(lambda (thread) (notmuch-show-insert-thread thread 0)) forest)) + (mapc (lambda (thread) (notmuch-show-insert-thread thread 0)) forest)) (defvar notmuch-show-thread-id nil) (make-variable-buffer-local 'notmuch-show-thread-id) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 982b7d3f..270f9833 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -662,16 +662,16 @@ foreground and blue background." ;; Create the overlay only if the message has tags which match one ;; of those specified in `notmuch-search-line-faces'. (let (overlay) - (mapc '(lambda (elem) - (let ((tag (car elem)) - (attributes (cdr elem))) - (when (member tag line-tag-list) - (when (not overlay) - (setq overlay (make-overlay start end))) - ;; Merge the specified properties with any already - ;; applied from an earlier match. - (overlay-put overlay 'face - (append (overlay-get overlay 'face) attributes))))) + (mapc (lambda (elem) + (let ((tag (car elem)) + (attributes (cdr elem))) + (when (member tag line-tag-list) + (when (not overlay) + (setq overlay (make-overlay start end))) + ;; Merge the specified properties with any already + ;; applied from an earlier match. + (overlay-put overlay 'face + (append (overlay-get overlay 'face) attributes))))) notmuch-search-line-faces))) (defun notmuch-search-author-propertize (authors)