From afaaf10e4a3c0333436dd2b6aff450379c557961 Mon Sep 17 00:00:00 2001 From: kaoru Date: Mon, 4 Jan 2010 05:48:01 +0000 Subject: [PATCH] * wl.el (wl-plugged-set-variables, wl-plugged-dop-queue-info) (wl-plugged-dop-queue-status): Don't quote `lambda'. * wl-thread.el (wl-thread-delete-message): Ditto * wl-summary.el (wl-summary-edit-addresses) (wl-summary-edit-addresses-collect-candidate-fields) (wl-summary-search-by-subject): Ditto. * wl-mime.el (wl-mime-node-id-to-string): Ditto. * wl-fldmgr.el (wl-fldmgr-add-completion-all-completions) (wl-fldmgr-add-completion-subr): Ditto. * wl-draft.el (wl-smtp-extension-bind) (wl-draft-insert-get-message, wl-draft-default-headers) (wl-jump-to-draft-buffer): Ditto. * wl-summary.el (wl-summary-cursor-move-surface, wl-summary-up) (wl-summary-down): Ditto. * wl-message.el (wl-message-buffer-prefetch-subr): Ditto. * wl-draft.el (wl-draft-reply, wl-draft-write-sendlog): Ditto. * wl-folder.el (wl-folder-make-save-access-list) (wl-folder-update-access-group, wl-folder-pick): Ditto. --- wl/ChangeLog | 21 ++++++++++++++++++++ wl/wl-draft.el | 26 ++++++++++++------------- wl/wl-fldmgr.el | 11 +++++------ wl/wl-folder.el | 26 ++++++++++++------------- wl/wl-message.el | 19 +++++++++--------- wl/wl-mime.el | 2 +- wl/wl-summary.el | 31 +++++++++++++++--------------- wl/wl-thread.el | 5 ++--- wl/wl.el | 56 +++++++++++++++++++++++++++--------------------------- 9 files changed, 108 insertions(+), 89 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index e39191d..52373b6 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,24 @@ +2010-01-04 TAKAHASHI Kaoru + + * wl.el (wl-plugged-set-variables, wl-plugged-dop-queue-info) + (wl-plugged-dop-queue-status): Don't quote `lambda'. + * wl-thread.el (wl-thread-delete-message): Ditto + * wl-summary.el (wl-summary-edit-addresses) + (wl-summary-edit-addresses-collect-candidate-fields) + (wl-summary-search-by-subject): Ditto. + * wl-mime.el (wl-mime-node-id-to-string): Ditto. + * wl-fldmgr.el (wl-fldmgr-add-completion-all-completions) + (wl-fldmgr-add-completion-subr): Ditto. + * wl-draft.el (wl-smtp-extension-bind) + (wl-draft-insert-get-message, wl-draft-default-headers) + (wl-jump-to-draft-buffer): Ditto. + * wl-summary.el (wl-summary-cursor-move-surface, wl-summary-up) + (wl-summary-down): Ditto. + * wl-message.el (wl-message-buffer-prefetch-subr): Ditto. + * wl-draft.el (wl-draft-reply, wl-draft-write-sendlog): Ditto. + * wl-folder.el (wl-folder-make-save-access-list) + (wl-folder-update-access-group, wl-folder-pick): Ditto. + 2010-01-02 TAKAHASHI Kaoru * wl-draft.el (wl-draft-default-headers): Suppress warning diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 947100a..4a98bcb 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -423,24 +423,24 @@ or `wl-draft-reply-with-argument-list' if WITH-ARG argument is non-nil." to (copy-sequence to)) t t)) (and to (setq to (mapconcat - '(lambda (addr) - (if wl-draft-reply-use-address-with-full-name - (or (cdr (assoc addr to-alist)) addr) - addr)) + (lambda (addr) + (if wl-draft-reply-use-address-with-full-name + (or (cdr (assoc addr to-alist)) addr) + addr)) to ",\n\t"))) (and cc (setq cc (mapconcat - '(lambda (addr) - (if wl-draft-reply-use-address-with-full-name - (or (cdr (assoc addr cc-alist)) addr) - addr)) + (lambda (addr) + (if wl-draft-reply-use-address-with-full-name + (or (cdr (assoc addr cc-alist)) addr) + addr)) cc ",\n\t"))) (and mail-followup-to (setq mail-followup-to (mapconcat - '(lambda (addr) - (if wl-draft-reply-use-address-with-full-name - (or (cdr (assoc addr (append to-alist cc-alist))) addr) - addr)) + (lambda (addr) + (if wl-draft-reply-use-address-with-full-name + (or (cdr (assoc addr (append to-alist cc-alist))) addr) + addr)) mail-followup-to ",\n\t"))) (and (null to) (setq to cc cc nil)) (setq references (delq nil references) @@ -865,7 +865,7 @@ text was killed." (concat " to=" (mapconcat 'identity - (mapcar '(lambda(x) (format "<%s>" x)) to) + (mapcar (lambda(x) (format "<%s>" x)) to) ",")))) "")) (id (if id (concat " id=" id) "")) diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index 642a928..77e25ca 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -762,10 +762,9 @@ return value is diffs '(-new -unread -all)." (let ((table (catch 'found (mapatoms - (function - (lambda (atom) - (if (string-match (symbol-name atom) string) - (throw 'found (symbol-value atom))))) + (lambda (atom) + (if (string-match (symbol-name atom) string) + (throw 'found (symbol-value atom)))) wl-fldmgr-add-completion-hashtb))) (pattern (if (string-match "\\.$" @@ -794,8 +793,8 @@ return value is diffs '(-new -unread -all)." (defun wl-fldmgr-add-completion-subr (string predicate flag) (let ((table (if (string= string "") - (mapcar (function (lambda (spec) - (list (char-to-string (car spec))))) + (mapcar (lambda (spec) + (list (char-to-string (car spec)))) elmo-folder-type-alist) (when (assq (aref string 0) elmo-folder-type-alist) (delq nil (mapcar diff --git a/wl/wl-folder.el b/wl/wl-folder.el index ddce576..caa0234 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -1623,12 +1623,12 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (list new unread all))) (defsubst wl-folder-make-save-access-list (list) - (mapcar '(lambda (x) - (cond - ((consp x) - (list (elmo-string (car x)) 'access)) - (t - (elmo-string x)))) + (mapcar (lambda (x) + (cond + ((consp x) + (list (elmo-string (car x)) 'access)) + (t + (elmo-string x)))) list)) (defun wl-folder-update-newest (indent entity) @@ -2675,9 +2675,9 @@ Use `wl-subscribed-mailing-list'." (if (or new-flist removes) (setq diff t)) (setq new-flist - (mapcar '(lambda (x) - (cond ((consp x) (list (car x) 'access)) - (t x))) + (mapcar (lambda (x) + (cond ((consp x) (list (car x) 'access)) + (t x))) new-flist)) ;; check new groups (let ((new-list new-flist)) @@ -2927,10 +2927,10 @@ Call `wl-summary-write-current-folder' with current folder name." (setq folder-list (cdr folder-list))) (if results (message "%s are picked." - (mapconcat '(lambda (res) - (format "%s(%d)" - (car res) - (length (cdr res)))) + (mapconcat (lambda (res) + (format "%s(%d)" + (car res) + (length (cdr res)))) results ",")) (message "No message was picked."))))) diff --git a/wl/wl-message.el b/wl/wl-message.el index c49281e..02904f9 100644 --- a/wl/wl-message.el +++ b/wl/wl-message.el @@ -778,15 +778,16 @@ Returns non-nil if bottom of message." (when wl-message-buffer-prefetch-debug (message "Buffer Cached Messages: %s" (mapconcat - '(lambda (cache) - (if (numberp (nth 1 (car cache))) - (if (string= - (nth 0 (car cache)) - (elmo-folder-name-internal folder)) - (format "%d" - (nth 1 (car cache))) - (format "*%d" (nth 1 (car cache)))) - "-")) + + (lambda (cache) + (if (numberp (nth 1 (car cache))) + (if (string= + (nth 0 (car cache)) + (elmo-folder-name-internal folder)) + (format "%d" + (nth 1 (car cache))) + (format "*%d" (nth 1 (car cache)))) + "-")) wl-message-buffer-cache " "))) ))) (defvar wl-message-button-map (make-sparse-keymap)) diff --git a/wl/wl-mime.el b/wl/wl-mime.el index 52cfad2..14ed778 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -419,7 +419,7 @@ It calls following-method selected from variable (defsubst wl-mime-node-id-to-string (node-id) (if (consp node-id) - (mapconcat (function (lambda (num) (format "%s" (1+ num)))) + (mapconcat (lambda (num) (format "%s" (1+ num))) (reverse node-id) ".") "0")) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 5c89489..06eeadc 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1431,16 +1431,16 @@ This function is defined by `wl-summary-define-sort-command'." sort-by) (setq fields (cdr fields))) (setq candidates (elmo-uniq-list candidates)) (elmo-with-enable-multibyte - (mapcar (function - (lambda (x) - (setq components (std11-extract-address-components x)) - (cons (nth 1 components) - (and (car components) - (eword-decode-string - (decode-mime-charset-string - (car components) - mime-charset)))))) - candidates)))) + (mapcar + (lambda (x) + (setq components (std11-extract-address-components x)) + (cons (nth 1 components) + (and (car components) + (eword-decode-string + (decode-mime-charset-string + (car components) + mime-charset))))) + candidates)))) (defun wl-summary-edit-addresses-subr (the-email name-in-addr) ;; returns nil if there's no change. @@ -1509,7 +1509,7 @@ Optional argument ADDR-STR is used as a target address if specified." (completing-read (format "Target address (%s): " address) (mapcar - (function (lambda (x) (cons (car x) (car x)))) + (lambda (x) (cons (car x) (car x))) candidates) nil nil nil nil address)))) (when address @@ -2681,10 +2681,9 @@ If ARG, without confirm." (message "Creating subject cache...") (wl-summary-insert-headers folder - (function - (lambda (x) - (funcall wl-summary-subject-filter-function - (elmo-message-entity-field x 'subject))))) + (lambda (x) + (funcall wl-summary-subject-filter-function + (elmo-message-entity-field x 'subject)))) (message "Creating subject cache...done")) (setq match (funcall wl-summary-subject-filter-function (elmo-message-entity-field entity 'subject))) @@ -3753,7 +3752,7 @@ Return non-nil if the mark is updated" (setq range (completing-read (format "Range (%s): " default) (mapcar - (function (lambda (x) (cons x x))) + (lambda (x) (cons x x)) input-range-list))) (if (string= range "") default diff --git a/wl/wl-thread.el b/wl/wl-thread.el index f1b12a2..a9026f3 100644 --- a/wl/wl-thread.el +++ b/wl/wl-thread.el @@ -488,9 +488,8 @@ ENTITY is returned." (apply (function nconc) update-msgs (mapcar - (function - (lambda (message) - (wl-thread-get-children-msgs message t))) + (lambda (message) + (wl-thread-get-children-msgs message t)) children)))) (wl-thread-entity-set-children parent (append older-brothers children younger-brothers)) diff --git a/wl/wl.el b/wl/wl.el index 250c80c..6b9c593 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -232,8 +232,8 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (wl-plugged-dop-queue-info)) (setq wl-plugged-alist (sort (copy-sequence elmo-plugged-alist) - '(lambda (a b) - (string< (caar a) (caar b)))))) + (lambda (a b) + (string< (caar a) (caar b)))))) (defun wl-plugged-sending-queue-info () ;; sending queue status @@ -276,9 +276,9 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." ope operation) ;(elmo-dop-queue-load) (elmo-dop-queue-merge) - (setq dop-queue (sort elmo-dop-queue '(lambda (a b) - (string< (elmo-dop-queue-fname a) - (elmo-dop-queue-fname b))))) + (setq dop-queue (sort elmo-dop-queue (lambda (a b) + (string< (elmo-dop-queue-fname a) + (elmo-dop-queue-fname b))))) (wl-append dop-queue (list nil)) ;; terminate(dummy) (when (car dop-queue) (setq last (elmo-dop-queue-fname (car dop-queue)))) ;; first @@ -313,29 +313,29 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (let ((operations (cdr qinfo)) (column (or column wl-plugged-queue-status-column))) (mapconcat - '(lambda (folder-ope) - (concat (wl-plugged-set-folder-icon - (car folder-ope) - (wl-folder-get-petname (car folder-ope))) - "(" - (let ((opes (cdr folder-ope)) - pair shrinked) - (while opes - (if (setq pair (assoc (car (car opes)) shrinked)) - (setcdr pair (+ (cdr pair) - (max (cdr (car opes)) 1))) - (setq shrinked (cons - (cons (car (car opes)) - (max (cdr (car opes)) 1)) - shrinked))) - (setq opes (cdr opes))) - (mapconcat - '(lambda (ope) - (if (> (cdr ope) 0) - (format "%s:%d" (car ope) (cdr ope)) - (format "%s" (car ope)))) - (nreverse shrinked) ",")) - ")")) + (lambda (folder-ope) + (concat (wl-plugged-set-folder-icon + (car folder-ope) + (wl-folder-get-petname (car folder-ope))) + "(" + (let ((opes (cdr folder-ope)) + pair shrinked) + (while opes + (if (setq pair (assoc (car (car opes)) shrinked)) + (setcdr pair (+ (cdr pair) + (max (cdr (car opes)) 1))) + (setq shrinked (cons + (cons (car (car opes)) + (max (cdr (car opes)) 1)) + shrinked))) + (setq opes (cdr opes))) + (mapconcat + (lambda (ope) + (if (> (cdr ope) 0) + (format "%s:%d" (car ope) (cdr ope)) + (format "%s" (car ope)))) + (nreverse shrinked) ",")) + ")")) operations (concat "\n" (wl-set-string-width column ""))))) -- 1.7.10.4