From a10e1abfc9834048bc0569ca2f61df3dd048669f Mon Sep 17 00:00:00 2001 From: kaoru Date: Thu, 26 Oct 2000 14:45:11 +0000 Subject: [PATCH] Checkdoc. Fixed comment-out style. --- wl/tm-wl.el | 2 +- wl/wl-address.el | 25 +++--- wl/wl-dnd.el | 4 +- wl/wl-draft.el | 36 +++++--- wl/wl-expire.el | 9 +- wl/wl-fldmgr.el | 52 +++++------ wl/wl-folder.el | 145 ++++++++++++++++--------------- wl/wl-highlight.el | 21 +++-- wl/wl-message.el | 24 ++--- wl/wl-mime.el | 10 ++- wl/wl-refile.el | 2 +- wl/wl-score.el | 19 ++-- wl/wl-summary.el | 246 +++++++++++++++++++++++++++------------------------- wl/wl-template.el | 7 +- wl/wl-thread.el | 68 +++++++-------- wl/wl-util.el | 26 +++--- wl/wl-vars.el | 161 +++++++++++++++++----------------- wl/wl-xmas.el | 4 +- 18 files changed, 462 insertions(+), 399 deletions(-) diff --git a/wl/tm-wl.el b/wl/tm-wl.el index 7cba1e3..e35fab7 100644 --- a/wl/tm-wl.el +++ b/wl/tm-wl.el @@ -210,7 +210,7 @@ By setting following-method as yank-content." (setq root-dir (concat root-dir "/" (replace-as-filename id))) (setq full-file (concat root-dir "/FULL")) (if (null target) - (error "%s is not supported. Sorry." target)) + (error "%s is not supported" target)) (if (or (file-exists-p full-file) (not (y-or-n-p "Merge partials?"))) (mime-article/decode-message/partial beg end cal) diff --git a/wl/wl-address.el b/wl/wl-address.el index c9b55bf..b0a27b8 100644 --- a/wl/wl-address.el +++ b/wl/wl-address.el @@ -49,8 +49,8 @@ Valid value is nit, t, 1 or larget integer. If this value nil, minimum alias postfix is made depends on uniqness -with other candidates. In this implementation, it's same to 1. If t, -always append all dn data. If number, always append spcified level of +with other candidates. In this implementation, it's same to 1. If t, +always append all dn data. If number, always append spcified level of data but maybe appended more uniqness. If invalid value, treat as nil. @@ -74,8 +74,7 @@ If level 3 is required for uniqness with other candidates, 2 => Goto/Shun-ichi_GOTO/Mew/Emacs ... appended more 3 => Goto/Shun-ichi_GOTO/Mew/Emacs 4 => Goto/Shun-ichi_GOTO/Mew/Emacs/Lisper - (so on...) -") + (so on...)") (defconst wl-ldap-alias-sep "/") @@ -387,7 +386,7 @@ Matched address lists are append to CL." (progn (delete-region start end) (insert (cdr alias)) - ; (wl-highlight-message (point-min)(point-max) t) +;;; (wl-highlight-message (point-min)(point-max) t) ))) (wl-complete-window-delete)) ((null completion) @@ -457,9 +456,13 @@ Matched address lists are append to CL." (defvar wl-address-init-func 'wl-local-address-init) (defun wl-address-init () + "Call `wl-address-init-func'." (funcall wl-address-init-func)) (defun wl-local-address-init () + "Reload `wl-address-file'. +Refresh `wl-address-list', `wl-address-completion-list', and +`wl-address-petname-hash'." (message "Updating addresses...") (setq wl-address-list (wl-address-make-address-list wl-address-file)) @@ -556,7 +559,7 @@ Matched address lists are append to CL." wl-from)))))) (defsubst wl-address-header-extract-address (str) - "Extracts a real e-mail address from STR and returns it. + "Extracts a real e-mail address from STR and return it. e.g. \"Mine Sakurai \" -> \"m-sakura@ccs.mt.nec.co.jp\". e.g. \"m-sakura@ccs.mt.nec.co.jp (Mine Sakurai)\" @@ -568,7 +571,7 @@ e.g. \"m-sakura@ccs.mt.nec.co.jp (Mine Sakurai)\" (t str))) (defsubst wl-address-header-extract-realname (str) - "Extracts a real name from STR and returns it. + "Extracts a real name from STR and return it. e.g. \"Mr. bar \" -> \"Mr. bar\"." (cond ((string-match "\\(.*[^ \t]\\)[ \t]*<[^>]*>" str) @@ -621,7 +624,7 @@ Group list contents is not included." address-string)) (defun wl-address-petname-delete (the-email) - "Delete petname in wl-address-file." + "Delete petname in `wl-address-file'." (let* ( (tmp-buf (get-buffer-create " *wl-petname-tmp*")) (output-coding-system (mime-charset-to-coding-system wl-mime-charset))) @@ -640,7 +643,7 @@ Group list contents is not included." default-petname default-realname &optional change-petname) - "Add petname to wl-address-file, if not registerd. + "Add petname to `wl-address-file', if not registerd. If already registerd, change it." (let (the-realname the-petname) @@ -654,8 +657,8 @@ If already registerd, change it." ;; setup output "realname" (setq the-realname (read-from-minibuffer (format "Real Name: ") default-realname)) -;; (if (string= the-realname "") -;; (setq the-realname default-petname)) +;;; (if (string= the-realname "") +;;; (setq the-realname default-petname)) ;; writing to ~/.address (let ( (tmp-buf (get-buffer-create " *wl-petname-tmp*")) diff --git a/wl/wl-dnd.el b/wl/wl-dnd.el index b4297ca..e242754 100644 --- a/wl/wl-dnd.el +++ b/wl/wl-dnd.el @@ -90,12 +90,12 @@ ext 'experimental-dragdrop-drop-functions '((wl-dnd-drop-func t t (buffer-substring beg end)))))) -; (set-extent-property ext 'mouse-face 'highlight))) +;;; (set-extent-property ext 'mouse-face 'highlight) (defun wl-dnd-set-drag-starter (beg end) (let (ext kmap) (setq ext (make-extent beg end)) -; (set-extent-property ext 'mouse-face 'isearch) +;;; (set-extent-property ext 'mouse-face 'isearch) (setq kmap (make-keymap)) (define-key kmap [button1] 'wl-dnd-start-drag) (set-extent-property ext 'keymap kmap))) diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 9d79497..f8db10f 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -142,9 +142,11 @@ the `wl-smtp-features' variable." (,@ body)))) (defun wl-draft-insert-date-field () + "Insert Date field." (insert "Date: " (wl-make-date-string) "\n")) (defun wl-draft-insert-from-field () + "Insert From field." ;; Put the "From:" field in unless for some odd reason ;; they put one in themselves. (let* ((login (or user-mail-address (user-login-name))) @@ -203,7 +205,7 @@ the `wl-smtp-features' variable." )) (defun wl-draft-insert-x-face-field-here () - "insert x-face field at point." + "Insert x-face field at point." (let ((x-face-string (elmo-get-file-string wl-x-face-file))) (if (string-match "^[ \t]*" x-face-string) (setq x-face-string (substring x-face-string (match-end 0)))) @@ -274,7 +276,8 @@ the `wl-smtp-features' variable." (mail-position-on-field "To")) (defun wl-draft-reply (buf no-arg summary-buf) -; (save-excursion + "" +;;;(save-excursion (let (r-list (eword-lexical-analyzer '(eword-analyze-quoted-string eword-analyze-domain-literal @@ -483,6 +486,7 @@ the `wl-smtp-features' variable." (wl-highlight-body-region beg (point-max))))) (defun wl-draft-confirm () + "Confirm send message." (interactive) (y-or-n-p (format "Send current draft as %s? " (if (wl-message-mail-p) @@ -490,22 +494,28 @@ the `wl-smtp-features' variable." "News")))) (defun wl-message-news-p () + "If exist valid Newsgroups field, return non-nil." (std11-field-body "Newsgroups")) (defun wl-message-field-exists-p (field) + "If FIELD exist and FIELD value is not empty, return non-nil." (let ((value (std11-field-body field))) (and value (not (string= value ""))))) (defun wl-message-mail-p () + "If exist To, Cc or Bcc field, return non-nil." (or (wl-message-field-exists-p "To") (wl-message-field-exists-p "Cc") (wl-message-field-exists-p "Bcc") - ;;(wl-message-field-exists-p "Fcc") ; This may be needed.. +;;; This may be needed.. +;;; (wl-message-field-exists-p "Fcc") )) (defun wl-draft-open-file (&optional file) - (interactive) ; "*fFile to edit: ") + "Open FILE for edit." + (interactive) +;;;(interactive "*fFile to edit: ") (wl-draft-edit-string (elmo-get-file-string (or file (read-file-name "File to edit: " @@ -955,7 +965,7 @@ non-nil." (goto-char (1+ delimline)) (if (eval mail-mailer-swallows-blank-line) (newline)) - ;;(run-hooks 'wl-mail-send-pre-hook) +;;; (run-hooks 'wl-mail-send-pre-hook) (if mail-interactive (save-excursion (set-buffer errbuf) @@ -998,6 +1008,8 @@ non-nil." (wl-draft-send-mail-with-smtp)) (defun wl-draft-insert-required-fields (&optional force-msgid) + "Insert Message-ID, Date, and From field. +If FORCE-MSGID, ignore 'wl-insert-message-id'." ;; Insert Message-Id field... (goto-char (point-min)) (when (and (or force-msgid @@ -1016,7 +1028,7 @@ non-nil." (wl-draft-insert-from-field))) (defun wl-draft-normal-send-func (editing-buffer kill-when-done) - "Send the message in the current buffer. " + "Send the message in the current buffer." (save-restriction (std11-narrow-to-header mail-header-separator) (wl-draft-insert-required-fields) @@ -1036,7 +1048,7 @@ non-nil." (wl-draft-delete editing-buffer))) (defun wl-draft-dispatch-message (&optional mes-string) - "Send the message in the current buffer. Not modified the header fields." + "Send the message in the current buffer. Not modified the header fields." (let (delimline) (if (and wl-draft-verbose-send mes-string) (message mes-string)) @@ -1083,7 +1095,7 @@ non-nil." (message (concat wl-draft-verbose-msg "done"))) (if mes-string (message (concat mes-string - (if sent-via "done." "failed."))))))))) + (if sent-via "done" "failed"))))))))) (not wl-sent-message-modified)) ;; return value (defun wl-draft-raw-send (&optional kill-when-done force-pre-hook mes-string) @@ -1091,9 +1103,9 @@ non-nil." (interactive) (save-excursion (let (wl-interactive-send -; wl-draft-verbose-send +;;; wl-draft-verbose-send (wl-mail-send-pre-hook (and force-pre-hook wl-mail-send-pre-hook)) -; wl-news-send-pre-hook +;;; wl-news-send-pre-hook mail-send-hook mail-send-actions) (wl-draft-send kill-when-done mes-string)))) @@ -1831,8 +1843,8 @@ If optional argument is non-nil, current draft buffer is killed" (setq failure (funcall wl-draft-queue-flush-send-func (format "Sending (%d/%d)..." i len))) -;; (wl-draft-raw-send nil nil -;; (format "Sending (%d/%d)..." i len)) +;;; (wl-draft-raw-send nil nil +;;; (format "Sending (%d/%d)..." i len)) (error (elmo-display-error err t) (setq failure t)) diff --git a/wl/wl-expire.el b/wl/wl-expire.el index 258a316..59a70e4 100644 --- a/wl/wl-expire.el +++ b/wl/wl-expire.el @@ -68,7 +68,7 @@ ((eq wl-summary-expire-reserve-marks 'none) t) (t - (error "invalid marks: %s" wl-summary-expire-reserve-marks)))) + (error "Invalid marks: %s" wl-summary-expire-reserve-marks)))) (defmacro wl-expire-make-sortable-date (date) (` (timezone-make-sortable-date @@ -200,7 +200,7 @@ If REFILE-LIST includes reserve mark message, so copy." nil nil t copy-reserve-message preserve-number)) - (error "expire: move msgs to %s failed" dst-folder)) + (error "Expire: move msgs to %s failed" dst-folder)) (wl-expire-append-log folder refile-list dst-folder (if copy-reserve-message 'copy 'move)) (setq copy-len (length refile-list)) @@ -228,7 +228,7 @@ If REFILE-LIST includes reserve mark message, so copy." (cons refile-list copy-len)))) (defun wl-expire-archive-get-folder (src-folder &optional fmt) - "Get archive folder name from src-folder." + "Get archive folder name from SRC-FOLDER." (let* ((spec (elmo-folder-get-spec src-folder)) (fmt (or fmt wl-expire-archive-folder-name-fmt)) (archive-spec (char-to-string @@ -466,6 +466,7 @@ Refile to archive folder followed message date." )) (defun wl-expire-hide (folder hide-list msgdb) + "" (let ((mess (format "Hiding %s msgs..." (length hide-list)))) (message mess) (elmo-msgdb-delete-msgs folder hide-list msgdb t) @@ -475,9 +476,11 @@ Refile to archive folder followed message date." (cons hide-list (length hide-list)))) (defsubst wl-expire-folder-p (folder) + "Return non-nil, when FOLDER matched `wl-expire-alist'." (wl-get-assoc-list-value wl-expire-alist folder)) (defun wl-summary-expire (&optional folder-name notsummary nolist) + "" (interactive) (let ((folder (or folder-name wl-summary-buffer-folder-name)) (alist wl-expire-alist) diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index dbec82a..c871c78 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -91,7 +91,7 @@ (defun wl-fldmgr-exit () (when (and wl-fldmgr-modified (or (not wl-interactive-save-folders) - (y-or-n-p "Folder view was modified. Save current folders? "))) + (y-or-n-p "Folder view was modified. Save current folders? "))) (wl-fldmgr-save-folders))) ;;; Macro and misc Function @@ -147,8 +147,8 @@ wl-folder-group-alist))) (defun wl-fldmgr-add-entity-hashtb (entities) - "update `wl-folder-entity-hashtb', `wl-folder-newsgroups-hashtb'. -return value is diffs '(new unread all)." + "Update `wl-folder-entity-hashtb', `wl-folder-newsgroups-hashtb'. +Return value is diffs '(new unread all)." (let* ((new-diff 0) (unread-diff 0) (all-diff 0) @@ -176,7 +176,7 @@ return value is diffs '(new unread all)." (list new-diff unread-diff all-diff))) (defun wl-fldmgr-delete-entity-hashtb (entities &optional clear) - "update `wl-folder-entity-hashtb'. + "Update `wl-folder-entity-hashtb'. return value is diffs '(-new -unread -all)." (let* ((new-diff 0) (unread-diff 0) @@ -444,27 +444,27 @@ return value is diffs '(-new -unread -all)." (save-excursion (beginning-of-line) (when prev -;; (wl-folder-next-entity-skip-invalid t) -;; (and (setq previous-entity -;; (wl-fldmgr-get-previous-entity wl-folder-entity -;; (wl-fldmgr-get-entity-id))) -;; ;; change entity to id -;; (setq previous-entity -;; (cons -;; (and (car previous-entity) -;; (wl-fldmgr-get-entity-id (car previous-entity))) -;; (and (cdr previous-entity) -;; (wl-fldmgr-get-entity-id (cdr previous-entity)))))) +;;; (wl-folder-next-entity-skip-invalid t) +;;; (and (setq previous-entity +;;; (wl-fldmgr-get-previous-entity wl-folder-entity +;;; (wl-fldmgr-get-entity-id))) +;;; ;; change entity to id +;;; (setq previous-entity +;;; (cons +;;; (and (car previous-entity) +;;; (wl-fldmgr-get-entity-id (car previous-entity))) +;;; (and (cdr previous-entity) +;;; (wl-fldmgr-get-entity-id (cdr previous-entity)))))) (wl-folder-prev-entity-skip-invalid)) (if (and prev (looking-at wl-folder-group-regexp) (string= (wl-match-buffer 2) "-")) (setq group-target nil) (if (and prev (bobp)) - (error "out of desktop group"))) + (error "Out of desktop group"))) (setq folder-path (wl-fldmgr-get-path wl-folder-entity (wl-folder-get-entity-from-buffer) - ;;(wl-fldmgr-get-entity-id) +;;; (wl-fldmgr-get-entity-id) group-target)) (let ((fp folder-path)) (while fp @@ -835,7 +835,7 @@ return value is diffs '(-new -unread -all)." (save-excursion (beginning-of-line) (if (looking-at wl-folder-group-regexp) - (error "can't delete group folder")) + (error "Can't delete group folder")) (let* ((inhibit-read-only t) (tmp (wl-fldmgr-get-path-from-buffer)) (entity (elmo-string (nth 4 tmp))) @@ -882,7 +882,7 @@ return value is diffs '(-new -unread -all)." (setcar group-entity group) (setcar (wl-string-assoc old-group wl-folder-group-alist) group) - ;;(setcdr (assq id wl-folder-entity-id-name-alist) group) +;;; (setcdr (assq id wl-folder-entity-id-name-alist) group) (wl-folder-set-id-name id group) (wl-fldmgr-delete-line) (wl-folder-insert-entity @@ -895,13 +895,13 @@ return value is diffs '(-new -unread -all)." (old-folder (nth 4 tmp)) new-folder) (if (eq (cdr (nth 2 tmp)) 'access) - (error "can't rename access folder")) + (error "Can't rename access folder")) (setq new-folder (wl-fldmgr-read-string (wl-summary-read-folder old-folder "to rename" t t old-folder))) (if (or (wl-folder-entity-exists-p new-folder) (file-exists-p (elmo-msgdb-expand-path new-folder))) - (error "already exists folder: %s" new-folder)) + (error "Already exists folder: %s" new-folder)) (elmo-rename-folder old-folder new-folder) (wl-folder-set-entity-info new-folder @@ -997,7 +997,7 @@ return value is diffs '(-new -unread -all)." (if (eq (cdr (nth 2 tmp)) 'access) (message "Can't change access group") (setq entity (nth 4 tmp)) - (unless entity (error "no folder")) + (unless entity (error "No folder")) (wl-fldmgr-add (concat "/" (elmo-read-search-condition wl-fldmgr-make-filter-default) @@ -1033,7 +1033,7 @@ return value is diffs '(-new -unread -all)." (point)))) (delete-region beg end) (wl-folder-insert-entity indent entity))) - ;;(wl-fldmgr-reconst-entity-hashtb t t) +;;; (wl-fldmgr-reconst-entity-hashtb t t) (message "Sorting...done") (set-buffer-modified-p nil))))) @@ -1100,8 +1100,8 @@ return value is diffs '(-new -unread -all)." (wl-fldmgr-delete-line) (when (wl-fldmgr-add folder) (wl-folder-maybe-load-folder-list folder) -;; (wl-folder-search-group-entity-by-name (car folder) -;; wl-folder-entity)) +;;; (wl-folder-search-group-entity-by-name (car folder) +;;; wl-folder-entity) (setq execed t))))) ((looking-at (format "^[ ]*%s\\(.*\\)" wl-folder-unsubscribe-mark)) (if (and type (> type 0)) @@ -1201,7 +1201,7 @@ return value is diffs '(-new -unread -all)." (old-petname (or (cdr pentry) "")) (change) petname) - (unless name (error "no folder")) + (unless name (error "No folder")) (if (and is-group (not (eq (nth 1 (wl-folder-search-group-entity-by-name name wl-folder-entity)) diff --git a/wl/wl-folder.el b/wl/wl-folder.el index 25de9c6..74e56f5 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -323,7 +323,7 @@ (goto-char (point-min)))) (defun wl-folder-next-entity-skip-invalid (&optional hereto) - "move to next entity. skip unsubscribed or removed entity." + "Move to next entity. skip unsubscribed or removed entity." (interactive) (beginning-of-line) (if (not hereto) @@ -416,9 +416,9 @@ (setq entity (wl-pop entities)) (cond ((consp entity) -;; (if (and (string= name (car entity)) -;; (eq id (wl-folder-get-entity-id (car entity)))) -;; (setq found t)) +;;; (if (and (string= name (car entity)) +;;; (eq id (wl-folder-get-entity-id (car entity)))) +;;; (setq found t)) (and entities (wl-push entities entity-stack)) (setq entities (nth 2 entity))) @@ -562,7 +562,7 @@ Optional argument ARG is repeart count." wl-force-fetch-folders))) (defun wl-folder-jump-to-current-entity (&optional arg) - "Enter the current folder. If optional arg exists, update folder list. " + "Enter the current folder. If optional ARG exists, update folder list." (interactive "P") (beginning-of-line) (let (entity beg end indent opened fname err fld-name) @@ -1004,7 +1004,7 @@ If current line is group folder, check all subfolders." (message "Syncing %s is done!" entity-name))))) (defun wl-folder-mark-as-read-all-entity (entity) - "Mark as read all messages in the ENTITY" + "Mark as read all messages in the ENTITY." (cond ((consp entity) (let ((flist (nth 2 entity))) @@ -1325,7 +1325,7 @@ If current line is group folder, all subfolders are marked." (select-window (get-buffer-window cur-buf))))))))) (defun wl-folder-prev-unsync () - "move cursor to the previous unsync folder." + "Move cursor to the previous unsync folder." (interactive) (let (start-point) (setq start-point (point)) @@ -1336,7 +1336,7 @@ If current line is group folder, all subfolders are marked." (message "No more unsync folder")))) (defun wl-folder-next-unsync (&optional plugged) - "move cursor to the next unsync." + "Move cursor to the next unsync." (interactive) (let (start-point entity) (setq start-point (point)) @@ -1355,7 +1355,7 @@ If current line is group folder, all subfolders are marked." (message "No more unsync folder")))) (defun wl-folder-prev-unread (&optional group) - "move cursor to the previous unread folder." + "Move cursor to the previous unread folder." (interactive "P") (let (start-point) (setq start-point (point)) @@ -1369,7 +1369,7 @@ If current line is group folder, all subfolders are marked." nil))) (defun wl-folder-next-unread (&optional group) - "move cursor to the next unread folder." + "Move cursor to the next unread folder." (interactive "P") (let (start-point) (setq start-point (point)) @@ -1421,7 +1421,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (defun wl-folder (&optional arg) (interactive "P") (let (initialize) -; (delete-other-windows) +;;; (delete-other-windows) (if (get-buffer wl-folder-buffer-name) (switch-to-buffer wl-folder-buffer-name) (switch-to-buffer (get-buffer-create wl-folder-buffer-name)) @@ -1467,11 +1467,11 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (if (setq buf (get-buffer wl-folder-buffer-name)) (wl-folder-entity-hashtb-set wl-folder-entity-hashtb name value buf)) -;; (elmo-folder-set-info-hashtb (elmo-string name) -;; nil -;; (nth 2 value) -;; (nth 0 value) -;; (nth 1 value)) +;;; (elmo-folder-set-info-hashtb (elmo-string name) +;;; nil +;;; (nth 2 value) +;;; (nth 0 value) +;;; (nth 1 value)) (setq wl-folder-info-alist-modified t)))) (defun wl-folder-calc-finfo (entity) @@ -1566,53 +1566,53 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (as-opened (cdr (assoc (car entity) wl-folder-group-alist))) beg ) -; (insert indent "[" (if as-opened "-" "+") "]" (car entity) "\n") -; (save-excursion (forward-line -1) -; (wl-highlight-folder-current-line)) +;;; (insert indent "[" (if as-opened "-" "+") "]" (car entity) "\n") +;;; (save-excursion (forward-line -1) +;;; (wl-highlight-folder-current-line)) (setq beg (point)) (if (and as-opened (not onlygroup)) (let (update-flist flist-unsub new-flist removed group-name-end) -; (when (and (eq (cadr entity) 'access) -; newest) -; (message "fetching folder entries...") -; (when (setq new-flist -; (elmo-list-folders -; (elmo-string (car entity)) -; (wl-string-member -; (car entity) -; wl-folder-hierarchy-access-folders) -; )) -; (setq update-flist -; (wl-folder-update-access-group entity new-flist)) -; (setq flist (nth 1 update-flist)) -; (when (car update-flist) ;; diff -; (setq flist-unsub (nth 2 update-flist)) -; (setq removed (nth 3 update-flist)) -; (elmo-msgdb-flist-save -; (car entity) -; (list -; (wl-folder-make-save-access-list flist) -; (wl-folder-make-save-access-list flist-unsub))) -; ;; -; ;; reconstruct wl-folder-entity-id-name-hashtb and -; ;; wl-folder-entity-hashtb -; ;; -; (wl-folder-entity-assign-id -; entity -; wl-folder-entity-id-name-hashtb -; t) -; (setq wl-folder-entity-hashtb -; (wl-folder-create-entity-hashtb -; entity -; wl-folder-entity-hashtb -; t)) -; (setq wl-folder-newsgroups-hashtb -; (or -; (wl-folder-create-newsgroups-hashtb -; entity nil) -; wl-folder-newsgroups-hashtb)))) -; (message "fetching folder entries...done")) +;;; (when (and (eq (cadr entity) 'access) +;;; newest) +;;; (message "fetching folder entries...") +;;; (when (setq new-flist +;;; (elmo-list-folders +;;; (elmo-string (car entity)) +;;; (wl-string-member +;;; (car entity) +;;; wl-folder-hierarchy-access-folders) +;;; )) +;;; (setq update-flist +;;; (wl-folder-update-access-group entity new-flist)) +;;; (setq flist (nth 1 update-flist)) +;;; (when (car update-flist) ;; diff +;;; (setq flist-unsub (nth 2 update-flist)) +;;; (setq removed (nth 3 update-flist)) +;;; (elmo-msgdb-flist-save +;;; (car entity) +;;; (list +;;; (wl-folder-make-save-access-list flist) +;;; (wl-folder-make-save-access-list flist-unsub))) +;;; ;; +;;; ;; reconstruct wl-folder-entity-id-name-hashtb and +;;; ;; wl-folder-entity-hashtb +;;; ;; +;;; (wl-folder-entity-assign-id +;;; entity +;;; wl-folder-entity-id-name-hashtb +;;; t) +;;; (setq wl-folder-entity-hashtb +;;; (wl-folder-create-entity-hashtb +;;; entity +;;; wl-folder-entity-hashtb +;;; t)) +;;; (setq wl-folder-newsgroups-hashtb +;;; (or +;;; (wl-folder-create-newsgroups-hashtb +;;; entity nil) +;;; wl-folder-newsgroups-hashtb)))) +;;; (message "fetching folder entries...done")) (insert indent "[" (if as-opened "-" "+") "]" (wl-folder-get-petname (car entity))) (setq group-name-end (point)) @@ -1732,8 +1732,8 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (unread-diff 0) ;;(fld (elmo-string folder)) value newvalue entity-list) - ;; Update folder-info - ;;(elmo-folder-set-info-hashtb fld nil nil nil unread) +;;; Update folder-info +;;; (elmo-folder-set-info-hashtb fld nil nil nil unread) (setq cur-unread (or (nth 1 (wl-folder-get-entity-info folder)) 0)) (setq unread-diff (- (or unread 0) cur-unread)) (setq value (wl-folder-get-entity-info folder)) @@ -1913,9 +1913,9 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (elmo-folder-info-make-hashtb info-alist wl-folder-entity-hashtb))) -;; (wl-folder-resume-entity-hashtb-by-finfo -;; wl-folder-entity-hashtb -;; info-alist))) +;;; (wl-folder-resume-entity-hashtb-by-finfo +;;; wl-folder-entity-hashtb +;;; info-alist))) (defun wl-folder-cleanup-variables () (setq wl-folder-entity nil @@ -1958,10 +1958,12 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (defvar wl-folder-init-func 'wl-local-folder-init) (defun wl-folder-init () + "Call `wl-folder-init-func' function." (interactive) (funcall wl-folder-init-func)) (defun wl-local-folder-init () + "Initialize local folder." (message "Initializing folder...") (save-excursion (set-buffer wl-folder-buffer-name) @@ -2043,7 +2045,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (beginning-of-line) (setq id (get-text-property (point) 'wl-folder-entity-id)) (if (looking-at "^[ ]*\\(.*\\):\\([0-9\\*-]*/[0-9\\*-]*/[0-9\\*]*\\)") - ;;(looking-at "^[ ]*\\([^\\[].+\\):\\([0-9\\*-]*/[0-9\\*-]*/[0-9\\*]*\\)") +;;; (looking-at "^[ ]*\\([^\\[].+\\):\\([0-9\\*-]*/[0-9\\*-]*/[0-9\\*]*\\)") (progn (delete-region (match-beginning 2) (match-end 2)) @@ -2069,9 +2071,9 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (defun wl-folder-goto-folder-subr (&optional folder sticky) (beginning-of-line) (let (summary-buf fld-name entity id error-selecting) -;; (setq fld-name (wl-folder-get-entity-from-buffer)) -;; (if (or (null fld-name) -;; (assoc fld-name wl-folder-group-alist)) +;;; (setq fld-name (wl-folder-get-entity-from-buffer)) +;;; (if (or (null fld-name) +;;; (assoc fld-name wl-folder-group-alist)) (setq fld-name wl-default-folder) (setq fld-name (or folder (wl-summary-read-folder fld-name))) @@ -2385,7 +2387,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (set-buffer-modified-p nil))) (defun wl-folder-open-close () - "open or close parent entity." + "Open or close parent entity." (interactive) (save-excursion (beginning-of-line) @@ -2516,7 +2518,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (list diff new-flist new-unsubscribes removes))) (defun wl-folder-prefetch-entity (entity) - "Prefetch all new messages in the ENTITY" + "Prefetch all new messages in the ENTITY." (cond ((consp entity) (let ((flist (nth 2 entity)) @@ -2585,7 +2587,7 @@ If current line is group folder, all subfolders are prefetched." (wl-folder-prefetch-entity entity))))) (defun wl-folder-drop-unsync-entity (entity) - "Drop all unsync messages in the ENTITY" + "Drop all unsync messages in the ENTITY." (cond ((consp entity) (let ((flist (nth 2 entity))) @@ -2627,6 +2629,7 @@ If optional arg exists, don't check any folders." (message "All unsync messages in %s are dropped!" entity-name))))) (defun wl-folder-write-current-newsgroup () + "" (interactive) (wl-summary-write-current-newsgroup (wl-folder-entity-name))) diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el index 90ebebc..b39de13 100644 --- a/wl/wl-highlight.el +++ b/wl/wl-highlight.el @@ -707,7 +707,7 @@ (defvar wl-highlight-summary-refiled-regexp " *[0-9]+o") (defvar wl-highlight-summary-copied-regexp " *[0-9]+O") (defvar wl-highlight-summary-target-regexp " *[0-9]+\\*") -;(defvar wl-highlight-summary-thread-top-regexp " *[0-9]+[^0-9][^0-9]../..\(.*\)..:.. \\[") +;;(defvar wl-highlight-summary-thread-top-regexp " *[0-9]+[^0-9][^0-9]../..\(.*\)..:.. \\[") (defvar wl-highlight-citation-face-list '(wl-highlight-message-cited-text-1 @@ -896,10 +896,12 @@ (setq fsymbol 'wl-highlight-summary-normal-face))))) (put-text-property bol eol 'face fsymbol) (if wl-use-highlight-mouse-line - (put-text-property bol;(1- (match-end 0)) + (put-text-property bol +;;; Use bol instead of (1- (match-end 0)) +;;; (1- (match-end 0)) eol 'mouse-face 'highlight)) -; (put-text-property (match-beginning 3) (match-end 3) -; 'face 'wl-highlight-thread-indent-face) +;;; (put-text-property (match-beginning 3) (match-end 3) +;;; 'face 'wl-highlight-thread-indent-face) ;; Dnd stuff. (if wl-use-dnd (wl-dnd-set-drag-starter bol eol))))) @@ -1069,7 +1071,7 @@ interpreted as cited text.)" (wl-highlight-message beg end t t)) (defun wl-highlight-signature-search-simple (beg end) - "Search signature area in the body message between beg and end. + "Search signature area in the body message between BEG and END. Returns start point of signature." (save-excursion (goto-char end) @@ -1080,7 +1082,7 @@ Returns start point of signature." end))) (defun wl-highlight-signature-search (beg end) - "Search signature area in the body message between beg and end. + "Search signature area in the body message between BEG and END. Returns start point of signature." (save-excursion (goto-char end) @@ -1144,7 +1146,7 @@ interpreted as cited text.)" current beg e p hend) (if too-big - nil + nil (save-excursion (save-restriction (widen) @@ -1163,7 +1165,7 @@ interpreted as cited text.)" ;; is sufficient (if (re-search-forward (format "^$\\|%s" - (regexp-quote mail-header-separator)) + (regexp-quote mail-header-separator)) nil t) (narrow-to-region (point-min) (point))) ;; highlight only when header is not too-big. @@ -1237,7 +1239,8 @@ interpreted as cited text.)" (cond (current (setq p (point)) (forward-line 1) ; this is to put the \n in the face too - (let ();(inhibit-read-only t)) + (let () +;;; ((inhibit-read-only t)) (put-text-property p (or end (point)) 'face current) (setq end nil)) diff --git a/wl/wl-message.el b/wl/wl-message.el index 8d52d2c..bec3f93 100644 --- a/wl/wl-message.el +++ b/wl/wl-message.el @@ -90,9 +90,9 @@ (setq gbw nil)) (if gbw (select-window gbw) -; (if (or (null mes) -; wl-stay-folder-window) -; (delete-other-windows)) +;;; (if (or (null mes) +;;; wl-stay-folder-window) +;;; (delete-other-windows)) (when wl-fixed-window-configuration (delete-other-windows) (and wl-stay-folder-window @@ -132,14 +132,14 @@ (widen) (forward-page 1) (if (pos-visible-in-window-p (point)) - (wl-message-narrow-to-page 1)))) ;Go to next page. + (wl-message-narrow-to-page 1)))) ; Go to next page. (if (eobp) () (scroll-up)) (select-window (get-buffer-window cur-buf)))) (defun wl-message-follow-current-entity (buffer) - "Follow to current message" + "Follow to current message." (wl-draft-reply (wl-message-get-original-buffer) 'to-all wl-message-buffer-cur-summary-buffer) (let ((mail-reply-buffer buffer)) @@ -211,7 +211,7 @@ (local-set-key "p" 'wl-message-exit) (local-set-key "n" 'wl-message-exit) (elmo-set-buffer-multibyte default-enable-multibyte-characters) - ;;(decode-mime-charset-region (point-min) (point-max) wl-mime-charset) +;;; (decode-mime-charset-region (point-min) (point-max) wl-mime-charset) ;; we can call decode-coding-region() directly, because multibyte flag is t. (decode-coding-region (point-min) (point-max) wl-cs-autoconv) (wl-highlight-message (point-min) @@ -231,7 +231,7 @@ (wl-message-decode-mode outbuf inbuf)))) (defun wl-message-prev-page (&optional lines) - "Scroll down this message. Returns non-nil if top of message" + "Scroll down this message. Returns non-nil if top of message." (interactive) (let ((cur-buf (current-buffer)) (view-message-buffer (get-buffer-create wl-message-buf-name)) @@ -264,7 +264,7 @@ (mime-open-entity backend (list folder number msgdb nil)))) (defun wl-message-next-page (&optional lines) - "Scroll up this message. Returns non-nil if bottom of message" + "Scroll up this message. Returns non-nil if bottom of message." (interactive) (let ((cur-buf (current-buffer)) (view-message-buffer (get-buffer-create wl-message-buf-name)) @@ -436,8 +436,8 @@ folder) msgdb)) (setq mmelmo-imap4-skipped-parts nil) - ;;; mime-display-message sets buffer-read-only variable as t. - ;;; which makes buffer read-only status confused... + ;; mime-display-message sets buffer-read-only variable as t. + ;; which makes buffer read-only status confused... (wl-mime-display-message cur-entity view-message-buffer nil nil 'mmelmo-original-mode) (if mmelmo-imap4-skipped-parts @@ -582,8 +582,8 @@ (wl-summary-redisplay))) (defun wl-message-refer-article-or-url (e) - "Read article specified by message-id around point. If failed, - attempt to execute button-dispatcher." + "Read article specified by message-id around point. +If failed, attempt to execute button-dispatcher." (interactive "e") (let ((window (get-buffer-window (current-buffer))) mouse-window point beg end msg-id) diff --git a/wl/wl-mime.el b/wl/wl-mime.el index 506dcb7..3b182f4 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -149,6 +149,7 @@ By setting following-method as yank-content." (` (mime-read-field (, field-name) (, entity))))) (defun wl-draft-preview-message () + "" (interactive) (let ((mime-display-header-hook 'wl-highlight-headers) mime-view-ignored-field-list ; all header. @@ -190,7 +191,8 @@ By setting following-method as yank-content." (defun wl-message-request-partial (folder number) (elmo-set-work-buf (elmo-read-msg-no-cache folder number (current-buffer)) - (mime-parse-buffer nil))); 'mime-buffer-entity))) +;;;(mime-parse-buffer nil 'mime-buffer-entity) + (mime-parse-buffer nil))) (defalias 'wl-message-read 'mime-preview-scroll-up-entity) (defalias 'wl-message-next-content 'mime-preview-move-to-next) @@ -225,6 +227,7 @@ By setting following-method as yank-content." number)) (defun wl-summary-burst () + "" (interactive) (let ((raw-buf (wl-message-get-original-buffer)) children message-entity content-type target) @@ -268,8 +271,7 @@ By setting following-method as yank-content." ;;; Yet another combine method. (defun wl-mime-combine-message/partial-pieces (entity situation) - "Internal method for wl to combine message/partial messages -automatically." + "Internal method for wl to combine message/partial messages automatically." (interactive) (let* ((msgdb (save-excursion (set-buffer wl-message-buffer-cur-summary-buffer) @@ -286,7 +288,7 @@ automatically." (setq root-dir (concat root-dir "/" (replace-as-filename id))) (setq full-file (concat root-dir "/FULL")) (if (or (file-exists-p full-file) - (not (y-or-n-p "Merge partials?"))) + (not (y-or-n-p "Merge partials? "))) (with-current-buffer mother (mime-store-message/partial-piece entity situation)) (setq subject-id diff --git a/wl/wl-refile.el b/wl/wl-refile.el index ccecc93..20dd26d 100644 --- a/wl/wl-refile.el +++ b/wl/wl-refile.el @@ -163,7 +163,7 @@ guess)) (defun wl-refile-evaluate-rule (rule entity) - "Returns folder string if RULE is matched to ENTITY. + "Return folder string if RULE is matched to ENTITY. If RULE does not match ENTITY, returns nil." (let ((case-fold-search t) fields guess pairs value) diff --git a/wl/wl-score.el b/wl/wl-score.el index 7e584a5..309fa91 100644 --- a/wl/wl-score.el +++ b/wl/wl-score.el @@ -115,7 +115,7 @@ The string in the accessible portion of the current buffer is simplified. It is assumed to be a single-line subject. Whitespace is generally cleaned up, and miscellaneous leading/trailing matter is removed. Additional things can be deleted by setting -wl-score-simplify-fuzzy-regexp." +`wl-score-simplify-fuzzy-regexp'." (let ((regexp (if (listp wl-score-simplify-fuzzy-regexp) (mapconcat (function identity) wl-score-simplify-fuzzy-regexp @@ -137,7 +137,7 @@ wl-score-simplify-fuzzy-regexp." (elmo-buffer-replace "^ +"))) (defun wl-score-simplify-string-fuzzy (string) - "Simplify a string fuzzily. + "Simplify a STRING fuzzily. See `wl-score-simplify-buffer-fuzzy' for details." (elmo-set-work-buf (let ((case-fold-search t)) @@ -146,6 +146,8 @@ See `wl-score-simplify-buffer-fuzzy' for details." (buffer-string)))) (defun wl-score-simplify-subject (subject) + "Simplify a SUBJECT fuzzily. +Remove Re, Was, Fwd etc." (elmo-set-work-buf (let ((regexp (if (listp wl-score-simplify-fuzzy-regexp) @@ -212,12 +214,14 @@ See `wl-score-simplify-buffer-fuzzy' for details." (sort messages func))) (defsubst wl-score-get (symbol &optional alist) + "Get SYMBOL's definition in ALIST." ;; Get SYMBOL's definition in ALIST. (cdr (assoc symbol (or alist wl-score-alist)))) (defun wl-score-set (symbol value &optional alist warn) + "Set SYMBOL to VALUE in ALIST." ;; Set SYMBOL to VALUE in ALIST. (let* ((alist (or alist wl-score-alist)) (entry (assoc symbol alist))) @@ -234,6 +238,8 @@ See `wl-score-simplify-buffer-fuzzy' for details." (cons (cons symbol value) (cdr alist))))))) (defun wl-score-cache-clean () + "Cleaning score cache. +Set `wl-score-cache' nil." (interactive) (setq wl-score-cache nil)) @@ -260,6 +266,7 @@ See `wl-score-simplify-buffer-fuzzy' for details." (setq wl-score-alist alist))))))) (defun wl-score-save () + "Save all score information." ;; Save all score information. (let ((cache wl-score-cache) entry score file dir) @@ -624,6 +631,7 @@ See `wl-score-simplify-buffer-fuzzy' for details." (eword-decode-region (point-min) (point-max)))))))) (defun wl-score-string (scores header now expire &optional extra-header) + "Insert the unique message headers in the buffer." ;; Insert the unique message headers in the buffer. (let ((wl-score-index (nth 2 (assoc header wl-score-header-index))) entries alist messages @@ -678,7 +686,7 @@ See `wl-score-simplify-buffer-fuzzy' for details." (and (eolp) (= (save-excursion (forward-line 0) (point)) (match-beginning 0)))) - ;;(end-of-line) +;;; (end-of-line) (setq found (setq arts (wl-score-get-alike))) ;; Found a match, update scores. (while (setq art (pop arts)) @@ -743,6 +751,7 @@ See `wl-score-simplify-buffer-fuzzy' for details." (wl-score-followup scores header now expire t)) (defun wl-score-followup (scores header now expire &optional thread) + "Insert the unique message headers in the buffer." ;; Insert the unique message headers in the buffer. (let ((wl-score-index (nth 2 (assoc header wl-score-header-index))) (all-scores scores) @@ -782,7 +791,7 @@ See `wl-score-simplify-buffer-fuzzy' for details." (and (eolp) (= (progn (beginning-of-line) (point)) (match-beginning 0)))) - ;;(end-of-line) +;;; (end-of-line) (setq found (setq arts (wl-score-get-alike))) ;; Found a match, update scores. (while (setq art (pop arts)) @@ -1292,7 +1301,7 @@ See `wl-score-simplify-buffer-fuzzy' for details." (call-interactively 'wl-score-edit-file))) (defun wl-score-edit-file (file) - "Edit a score file." + "Edit a score FILE." (interactive (list (read-file-name "Edit score file: " wl-score-files-dir))) (when (wl-collect-summary) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 8c299ee..3b57282 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -383,10 +383,10 @@ (define-key wl-summary-mode-map "p" 'wl-summary-prev) (define-key wl-summary-mode-map "N" 'wl-summary-down) (define-key wl-summary-mode-map "P" 'wl-summary-up) -; (define-key wl-summary-mode-map "w" 'wl-draft) +;;;(define-key wl-summary-mode-map "w" 'wl-draft) (define-key wl-summary-mode-map "w" 'wl-summary-write) (define-key wl-summary-mode-map "W" 'wl-summary-write-current-newsgroup) -; (define-key wl-summary-mode-map "e" 'wl-draft-open-file) +;;;(define-key wl-summary-mode-map "e" 'wl-draft-open-file) (define-key wl-summary-mode-map "e" 'wl-summary-save) (define-key wl-summary-mode-map "\C-c\C-o" 'wl-jump-to-draft-buffer) (define-key wl-summary-mode-map "H" 'wl-summary-redisplay-all-header) @@ -556,7 +556,7 @@ (defun wl-summary-reedit (&optional arg) "Re-edit current message. -If optional argument is non-nil, Supersedes message" +If ARG is non-nil, Supersedes message" (interactive "P") (if arg (wl-summary-supersedes-message) @@ -666,7 +666,7 @@ you." (message "Resending message to %s...done" address)))) (defun wl-summary-msgdb-load-async (folder) - "Loading msgdb and selecting folder is executed asynchronously in IMAP4." + "Loading msgdb and selecting FOLDER is executed asynchronously in IMAP4." (if (and (elmo-folder-plugged-p folder) (eq (elmo-folder-get-type folder) 'imap4)) (let ((spec (elmo-folder-get-spec folder)) @@ -786,18 +786,17 @@ mt Put the '*' mark onto all messages which belong to th current thread. ma Put the '*' mark onto all messages. ? Pick messages according to a pick pattern which you input, then put the '*' mark onto them. -q Goto folder mode. -" +q Goto folder mode." (interactive) (unless (interactive-p) (kill-all-local-variables)) (setq major-mode 'wl-summary-mode) (setq mode-name "Summary") (use-local-map wl-summary-mode-map) -;; (setq default-directory (or wl-tmp-dir (expand-file-name "~/"))) +;;;(setq default-directory (or wl-tmp-dir (expand-file-name "~/"))) (setq buffer-read-only t) (setq truncate-lines t) -;; (make-local-variable 'tab-width) -;; (setq tab-width 1) +;;;(make-local-variable 'tab-width) +;;;(setq tab-width 1) (buffer-disable-undo (current-buffer)) (if wl-use-semi (setq wl-summary-buffer-message-redisplay-func @@ -813,7 +812,7 @@ q Goto folder mode. (run-hooks 'wl-summary-mode-hook)) (defun wl-summary-overview-entity-compare-by-date (x y) - "Compare entity by date" + "Compare entity X and Y by date." (condition-case nil (string< (timezone-make-date-sortable @@ -823,13 +822,13 @@ q Goto folder mode. (error))) ;; ignore error. (defun wl-summary-overview-entity-compare-by-number (x y) - "Compare entity by number" + "Compare entity X and Y by number." (< (elmo-msgdb-overview-entity-get-number x) (elmo-msgdb-overview-entity-get-number y))) (defun wl-summary-overview-entity-compare-by-from (x y) - "Compare entity by from" + "Compare entity X and Y by from." (string< (wl-address-header-extract-address (or (elmo-msgdb-overview-entity-get-from-no-decode x) @@ -839,7 +838,7 @@ q Goto folder mode. wl-summary-no-from-message)))) (defun wl-summary-overview-entity-compare-by-subject (x y) - "Compare entity by subject" + "Compare entity X and Y by subject." (string< (elmo-msgdb-overview-entity-get-subject-no-decode x) (elmo-msgdb-overview-entity-get-subject-no-decode y))) @@ -1021,12 +1020,12 @@ q Goto folder mode. (elmo-msgdb-mark-save path (elmo-msgdb-get-mark-alist wl-summary-buffer-msgdb)) -;; (elmo-folder-set-info-hashtb -;; (elmo-string wl-summary-buffer-folder-name) -;; nil nil -;; 0 -;; (+ wl-summary-buffer-new-count wl-summary-buffer-unread-count)) -;; (setq wl-folder-info-alist-modified t) +;;; (elmo-folder-set-info-hashtb +;;; (elmo-string wl-summary-buffer-folder-name) +;;; nil nil +;;; 0 +;;; (+ wl-summary-buffer-new-count wl-summary-buffer-unread-count)) +;;; (setq wl-folder-info-alist-modified t) (setq wl-summary-buffer-mark-modified nil) (run-hooks 'wl-summary-buffer-mark-saved-hook)))))) @@ -1034,7 +1033,7 @@ q Goto folder mode. (if (or wl-summary-buffer-refile-list wl-summary-buffer-copy-list wl-summary-buffer-delete-list) - (if (y-or-n-p "Marks remain to be executed. Execute them?") + (if (y-or-n-p "Marks remain to be executed. Execute them? ") (progn (wl-summary-exec) (if (or wl-summary-buffer-refile-list @@ -1067,12 +1066,12 @@ q Goto folder mode. (wl-summary-msgdb-save))) (defun wl-summary-force-exit () - "Exit current summary. Buffer is deleted even the buffer is sticky" + "Exit current summary. Buffer is deleted even the buffer is sticky." (interactive) (wl-summary-exit 'force-exit)) (defun wl-summary-exit (&optional force-exit) - "Exit current summary. if FORCE-EXIT, exits even the summary is sticky." + "Exit current summary. if FORCE-EXIT, exits even the summary is sticky." (interactive "P") (let ((summary-buf (current-buffer)) (sticky (wl-summary-sticky-p)) @@ -1147,7 +1146,7 @@ q Goto folder mode. (let* ((msgdb wl-summary-buffer-msgdb) (number-alist (elmo-msgdb-get-number-alist msgdb))) (elmo-mark-as-read wl-summary-buffer-folder-name - (mapcar + (mapcar (lambda (msgid) (car (rassoc msgid number-alist))) seen-list) msgdb))) @@ -1196,7 +1195,7 @@ q Goto folder mode. (setq mes (wl-summary-sync-update3 seen-list unset-cursor)) (elmo-msgdb-seen-save msgdb-dir nil) ; delete all seen. (if mes (message "%s" mes))) -; (wl-summary-sync-all folder t)) +;;; (wl-summary-sync-all folder t)) ((string= range "rescan") (let ((msg (wl-summary-message-number))) (wl-summary-rescan) @@ -1330,13 +1329,13 @@ Optional argument ADDR-STR is used as a target address if specified." (nth 1 address) (nth 0 address) result))) - ;; i'd like to update summary-buffer, but... - ;;(wl-summary-rescan) +;;; i'd like to update summary-buffer, but... +;;; (wl-summary-rescan) (run-hooks 'wl-summary-edit-addresses-hook))))) (defun wl-summary-incorporate (&optional arg) "Check and prefetch all uncached messages. -If optional argument is non-nil, checking is omitted." +If ARG is non-nil, checking is omitted." (interactive "P") (unless arg (save-excursion @@ -1372,7 +1371,7 @@ If optional argument is non-nil, checking is omitted." (widen) (y-or-n-p (format - "Message from %s has %d bytes. Prefetch it?" + "Message from %s has %d bytes. Prefetch it? " (concat "[ " (save-match-data @@ -1445,10 +1444,10 @@ If optional argument is non-nil, checking is omitted." wl-summary-buffer-new-count))) new-mark)))))))) -;(defvar wl-summary-message-uncached-marks -; (list wl-summary-new-mark -; wl-summary-unread-uncached-mark -; wl-summary-read-uncached-mark)) +;;(defvar wl-summary-message-uncached-marks +;; (list wl-summary-new-mark +;; wl-summary-unread-uncached-mark +;; wl-summary-read-uncached-mark)) (defun wl-summary-prefetch-region (beg end &optional prefetch-marks) (interactive "r") @@ -1587,7 +1586,7 @@ If optional argument is non-nil, checking is omitted." (wl-highlight-summary-current-line)))))) (defun wl-summary-delete-all-marks (mark-alist mark) - "Delete all MARKs in MARK-ALIST" + "Delete all MARKs in MARK-ALIST." (let ((malist mark-alist) (ret-val mark-alist) entity) @@ -1604,8 +1603,10 @@ If optional argument is non-nil, checking is omitted." (interactive "r") (save-excursion (save-restriction - (narrow-to-region beg end);(save-excursion (goto-char end) - ; (end-of-line) (point))) + (narrow-to-region beg end) +;;; use narrowing. +;;; (save-excursion (goto-char end) +;;; (end-of-line) (point))) (goto-char (point-min)) (if (eq wl-summary-buffer-view 'thread) (progn @@ -1634,8 +1635,10 @@ If optional argument is non-nil, checking is omitted." (interactive "r") (save-excursion (save-restriction - (narrow-to-region beg end);(save-excursion (goto-char end) - ; (end-of-line) (point))) + (narrow-to-region beg end) +;;; use narrowing. +;;; (save-excursion (goto-char end) +;;; (end-of-line) (point))) (goto-char (point-min)) (if (eq wl-summary-buffer-view 'thread) (progn @@ -1695,11 +1698,11 @@ If optional argument is non-nil, checking is omitted." (defun wl-summary-mark-as-read-all () (interactive) (if (or (not (interactive-p)) - (y-or-n-p "Mark all messages as read?")) + (y-or-n-p "Mark all messages as read? ")) (let* ((folder wl-summary-buffer-folder-name) (cur-buf (current-buffer)) (msgdb wl-summary-buffer-msgdb) - ;;(number-alist (elmo-msgdb-get-number-alist msgdb)) +;;; (number-alist (elmo-msgdb-get-number-alist msgdb)) (mark-alist (elmo-msgdb-get-mark-alist msgdb)) (malist mark-alist) (inhibit-read-only t) @@ -1724,14 +1727,16 @@ If optional argument is non-nil, checking is omitted." (setq mark-alist (elmo-msgdb-mark-set mark-alist - msg ;(cdr (assq msg number-alist)) + msg +;;; Use msg instead of (cdr (assq msg number-alist)). +;;; (cdr (assq msg number-alist)) nil))) ;; New mark and unread-uncached mark (insert wl-summary-read-uncached-mark) (setq mark-alist (elmo-msgdb-mark-set mark-alist msg - ; (cdr (assq msg number-alist)) +;;; (cdr (assq msg number-alist)) wl-summary-read-uncached-mark))) (if wl-summary-highlight (wl-highlight-summary-current-line nil nil t))))) @@ -1758,7 +1763,7 @@ If optional argument is non-nil, checking is omitted." (number-alist (elmo-msgdb-get-number-alist msgdb)) (case-fold-search nil) mark number unread new-mark) -; (re-search-backward "^ *[0-9]+..[0-9]+/[0-9]+" nil t) ; set cursor line +;;; (re-search-backward "^ *[0-9]+..[0-9]+/[0-9]+" nil t) ; set cursor line (beginning-of-line) (when (looking-at "^ *\\([0-9]+\\)[^0-9]\\([^0-9]\\)") (progn @@ -1843,7 +1848,7 @@ If optional argument is non-nil, checking is omitted." (defun wl-summary-resume-marks-and-highlight () (let* ((msgdb wl-summary-buffer-msgdb) (mark-alist (elmo-msgdb-get-mark-alist msgdb)) - ;;(number-alist (elmo-msgdb-get-number-alist msgdb)) +;;; (number-alist (elmo-msgdb-get-number-alist msgdb)) (count (count-lines (point-min)(point-max))) (i 0) msg-num percent smark) @@ -1880,7 +1885,8 @@ If optional argument is non-nil, checking is omitted." (while mark-alist (setq entity (car mark-alist)) (if (setq msg-num (car (rassoc (car entity) number-alist))) - (progn ;(goto-char (point-min)) + (progn +;;; (goto-char (point-min)) (if (re-search-forward (format "^ *%s \\( \\)" msg-num) nil t) (progn (delete-region (match-beginning 1) (match-end 1)) @@ -1967,7 +1973,7 @@ If optional argument is non-nil, checking is omitted." ret-val)) (defun wl-summary-set-status-marks (mark-alist before after) - "Set the BEFORE marks to AFTER" + "Set the BEFORE marks to AFTER." (let ((ret-val mark-alist) entity) (while mark-alist @@ -1980,7 +1986,7 @@ If optional argument is non-nil, checking is omitted." ret-val)) (defun wl-summary-set-status-marks-on-buffer (before after) - "Set the MARKS marks on buffer" + "Set the MARKS marks on buffer." (interactive) (save-excursion (goto-char (point-min)) @@ -2027,7 +2033,7 @@ If optional argument is non-nil, checking is omitted." (defun wl-summary-get-append-message-func () (if (eq wl-summary-buffer-view 'thread) 'wl-summary-insert-thread-entity -; 'wl-summary-insert-thread +;;; 'wl-summary-insert-thread 'wl-summary-insert-summary)) (defun wl-summary-sort () @@ -2123,7 +2129,7 @@ If optional argument is non-nil, checking is omitted." (let ((len (length appends)) in) (if (> len wl-summary-update-confirm-threshold) - (if (y-or-n-p (format "Too many messages(%d). Continue?" len)) + (if (y-or-n-p (format "Too many messages(%d). Continue? " len)) appends (setq in wl-summary-update-confirm-threshold) (catch 'end @@ -2133,7 +2139,7 @@ If optional argument is non-nil, checking is omitted." in (string-to-int in)) (if (< len in) (throw 'end len)) - (if (y-or-n-p (format "%d messages are disappeared. OK?" + (if (y-or-n-p (format "%d messages are disappeared. OK? " (max (- len in) 0))) (throw 'end in)))) (nthcdr (max (- len in) 0) appends)) @@ -2150,7 +2156,7 @@ If optional argument is non-nil, checking is omitted." (number-alist (elmo-msgdb-get-number-alist msgdb)) (mark-alist (elmo-msgdb-get-mark-alist msgdb)) (overview (elmo-msgdb-get-overview msgdb)) - ;;(location (elmo-msgdb-get-location msgdb)) +;;; (location (elmo-msgdb-get-location msgdb)) (case-fold-search nil) (elmo-mime-charset wl-summary-buffer-mime-charset) (inhibit-read-only t) @@ -2164,7 +2170,7 @@ If optional argument is non-nil, checking is omitted." entity ret-val crossed crossed2 sync-all update-thread update-top-list mark expunged msgs unreads importants) - ;(setq seen-list nil) ;for debug. +;;; (setq seen-list nil) ;for debug. (fset 'wl-summary-append-message-func-internal (wl-summary-get-append-message-func)) ;; Flush pending append operations (disconnected operation). @@ -2216,10 +2222,10 @@ If optional argument is non-nil, checking is omitted." (when delete-list (message "Deleting...") (elmo-msgdb-delete-msgs folder delete-list msgdb t) ; reserve cache. - ;;(set-buffer cur-buf) +;;; (set-buffer cur-buf) (wl-summary-delete-messages-on-buffer delete-list "Deleting...") (message "Deleting...done")) - ;;(set-buffer cur-buf) +;;; (set-buffer cur-buf) ;; Change "New" marks to "Uncached Unread" marks. (wl-summary-set-status-marks mark-alist wl-summary-new-mark @@ -2258,7 +2264,7 @@ If optional argument is non-nil, checking is omitted." (setq overview (elmo-msgdb-get-overview msgdb)) (setq number-alist (elmo-msgdb-get-number-alist msgdb)) (setq mark-alist (elmo-msgdb-get-mark-alist msgdb)) - ;; (setq location (elmo-msgdb-get-location msgdb)) +;;; (setq location (elmo-msgdb-get-location msgdb)) (setq curp overview-append) (setq num (length curp)) (setq wl-summary-delayed-update nil) @@ -2299,7 +2305,7 @@ If optional argument is non-nil, checking is omitted." (wl-thread-update-indent-string-thread (elmo-uniq-list update-top-list))) (message "Updating thread...done") - ;;(set-buffer cur-buf) +;;; (set-buffer cur-buf) )) (wl-summary-set-message-modified) (wl-summary-set-mark-modified) @@ -2449,9 +2455,9 @@ If optional argument is non-nil, checking is omitted." (defun wl-summary-move (src dsts-msgs) (let* ((dsts (car dsts-msgs)) ; (+foo +bar) -;; (msgs (cdr dsts-msgs)) ; (1 2 3) -;; (msgdb wl-summary-buffer-msgdb) -;; result) +;;; (msgs (cdr dsts-msgs)) ; (1 2 3) +;;; (msgdb wl-summary-buffer-msgdb) +;;; result) ) (while dsts (setq dsts (cdr dsts))))) @@ -2499,7 +2505,7 @@ If optional argument is non-nil, checking is omitted." (set-buffer cur-buf) (if (null dels) (message "No message to delete.") - (if (y-or-n-p (format "%s has %d message(s). Delete all?" + (if (y-or-n-p (format "%s has %d message(s). Delete all? " wl-summary-buffer-folder-name (length dels))) (progn @@ -2508,13 +2514,13 @@ If optional argument is non-nil, checking is omitted." wl-summary-buffer-msgdb) (elmo-msgdb-delete-msgs wl-summary-buffer-folder-name dels wl-summary-buffer-msgdb) - ;;(elmo-msgdb-save wl-summary-buffer-folder-name nil) +;;; (elmo-msgdb-save wl-summary-buffer-folder-name nil) (wl-summary-set-message-modified) (wl-summary-set-mark-modified) (wl-folder-set-folder-updated wl-summary-buffer-folder-name (list 0 0 0)) - ;; for thread. - ;; (setq wl-thread-top-entity '(nil t nil nil)) +;;; for thread. +;;; (setq wl-thread-top-entity '(nil t nil nil)) (setq wl-summary-buffer-unread-count 0) (setq wl-summary-buffer-new-count 0) (wl-summary-update-modeline) @@ -2522,13 +2528,14 @@ If optional argument is non-nil, checking is omitted." (let ((inhibit-read-only t) (buffer-read-only nil)) (erase-buffer)) - ;; (if wl-summary-cache-use (wl-summary-save-view-cache)) +;;; (if wl-summary-cache-use (wl-summary-save-view-cache)) (message "Deleting...done") t) nil)))) (defun wl-summary-toggle-thread (&optional arg) - "Toggle thread status (T)hread and (S)equencial." + "Toggle thread status (T)hread and (S)equencial. +If ARG, without confirm." (interactive "P") (when (or arg (y-or-n-p (format "Toggle threading? (y=%s): " @@ -2555,7 +2562,7 @@ If optional argument is non-nil, checking is omitted." (setq ret-val (condition-case nil (read (current-buffer)) - (error (error "reading failed"))))) + (error (error "Reading failed"))))) (kill-buffer tmp-buffer) ret-val))) @@ -2587,14 +2594,14 @@ If optional argument is non-nil, checking is omitted." (interactive "P") (if (wl-summary-sticky-p) (message "Current summary buffer is already sticky.") - (when (or force (y-or-n-p "Stick current summary buffer?")) + (when (or force (y-or-n-p "Stick current summary buffer? ")) (wl-summary-toggle-disp-msg 'off) (wl-summary-switch-to-clone-buffer (wl-summary-sticky-buffer-name wl-summary-buffer-folder-name)) ;;; ???hang up -; (rename-buffer (wl-summary-sticky-buffer-name -; wl-summary-buffer-folder-name))) +;;; (rename-buffer (wl-summary-sticky-buffer-name +;;; wl-summary-buffer-folder-name))) (message "Folder `%s' is now sticky." wl-summary-buffer-folder-name)))) (defun wl-summary-switch-to-clone-buffer (buffer-name) @@ -2691,7 +2698,7 @@ If optional argument is non-nil, checking is omitted." (defun wl-summary-goto-folder-subr (&optional folder scan-type other-window sticky interactive scoring) - "Display target folder on summary" + "Display target folder on summary." (interactive) (let* ((keep-cursor (memq this-command wl-summary-keep-cursor-command)) @@ -2838,7 +2845,7 @@ If optional argument is non-nil, checking is omitted." retval)) (defun wl-summary-summary-line-already-exists-p (parent-number buffer) - "returns the depth." + "Return the depth." (set-buffer buffer) (goto-char (point-max)) (let ((depth 0)) @@ -3003,7 +3010,7 @@ If optional argument is non-nil, checking is omitted." (let* ((this-id (elmo-msgdb-overview-entity-get-id entity)) (parent-entity (elmo-msgdb-overview-get-parent-entity entity overview));; temp - ;;(parent-id (elmo-msgdb-overview-entity-get-id parent-entity)) +;;; (parent-id (elmo-msgdb-overview-entity-get-id parent-entity)) (parent-number (elmo-msgdb-overview-entity-get-number parent-entity)) (case-fold-search t) msg overview2 cur-entity linked retval delayed-entity) @@ -3096,7 +3103,7 @@ If optional argument is non-nil, checking is omitted." (folder wl-summary-buffer-folder-name) (msgdb wl-summary-buffer-msgdb) (mark-alist (elmo-msgdb-get-mark-alist msgdb)) - ;;(number-alist (elmo-msgdb-get-number-alist msgdb)) +;;; (number-alist (elmo-msgdb-get-number-alist msgdb)) new-mark visible mark) (if number (progn @@ -3305,12 +3312,12 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (goto-char start) ; avoid moving cursor to ; the bottom line. (while dst-msgs - ;;(elmo-msgdb-add-msgs-to-seen-list - ;; (car (car dst-msgs)) ;dst-folder - ;; (cdr (car dst-msgs)) ;msgs - ;; wl-summary-buffer-msgdb - ;; (concat wl-summary-important-mark - ;; wl-summary-read-uncached-mark)) +;;; (elmo-msgdb-add-msgs-to-seen-list +;;; (car (car dst-msgs)) ;dst-folder +;;; (cdr (car dst-msgs)) ;msgs +;;; wl-summary-buffer-msgdb +;;; (concat wl-summary-important-mark +;;; wl-summary-read-uncached-mark)) (setq result nil) (condition-case nil (setq result (elmo-move-msgs wl-summary-buffer-folder-name @@ -3340,12 +3347,12 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." ;; begin cOpy... (setq dst-msgs (wl-inverse-alist copies wl-summary-buffer-copy-list)) (while dst-msgs - ;;(elmo-msgdb-add-msgs-to-seen-list - ;; (car (car dst-msgs)) ;dst-folder - ;; (cdr (car dst-msgs)) ;msgs - ;; wl-summary-buffer-msgdb - ;; (concat wl-summary-important-mark - ;; wl-summary-read-uncached-mark)) +;;; (elmo-msgdb-add-msgs-to-seen-list +;;; (car (car dst-msgs)) ;dst-folder +;;; (cdr (car dst-msgs)) ;msgs +;;; wl-summary-buffer-msgdb +;;; (concat wl-summary-important-mark +;;; wl-summary-read-uncached-mark)) (setq result nil) (condition-case nil (setq result (elmo-move-msgs wl-summary-buffer-folder-name @@ -3439,14 +3446,14 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (defun wl-summary-remove-destination ())) (defsubst wl-summary-get-mark (number) - "Returns a temporal mark of message specified by NUMBER." + "Return a temporal mark of message specified by NUMBER." (or (and (memq number wl-summary-buffer-delete-list) "D") (and (assq number wl-summary-buffer-copy-list) "O") (and (assq number wl-summary-buffer-refile-list) "o") (and (assq number wl-summary-buffer-target-mark-list) "*"))) (defsubst wl-summary-reserve-temp-mark-p (mark) - "Returns t if temporal MARK should be reserved." + "Return t if temporal MARK should be reserved." (member mark wl-summary-reserve-mark-list)) (defun wl-summary-refile (&optional dst number) @@ -3551,7 +3558,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." msg-num))) (defun wl-summary-refile-prev-destination () - "Refile message to previously refiled destination" + "Refile message to previously refiled destination." (interactive) (wl-summary-refile wl-summary-buffer-prev-refile-destination (wl-summary-message-number)) @@ -3560,7 +3567,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (wl-summary-next))) (defun wl-summary-copy-prev-destination () - "Refile message to previously refiled destination" + "Refile message to previously refiled destination." (interactive) (wl-summary-copy wl-summary-buffer-prev-copy-destination (wl-summary-message-number)) @@ -3572,7 +3579,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (member (cadr (assq msg mark-alist)) wl-summary-auto-refile-skip-marks)) (defun wl-summary-auto-refile (&optional open-all) - "Set refile mark automatically according to wl-refile-guess-by-rule." + "Set refile mark automatically according to 'wl-refile-guess-by-rule'." (interactive "P") (message "Marking...") (save-excursion @@ -3852,7 +3859,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (setq beg (point)) (end-of-line) (wl-summary-goto-bottom-of-current-thread) -; (forward-line -1) +;;; (forward-line -1) (beginning-of-line) (setq end (point)) (wl-summary-target-mark-region beg end))) @@ -3867,7 +3874,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (defun wl-summary-pick (&optional from-list delete-marks) (interactive) - (let ((result (elmo-msgdb-search + (let ((result (elmo-msgdb-search wl-summary-buffer-folder-name (elmo-read-search-condition wl-summary-pick-field-default) wl-summary-buffer-msgdb))) @@ -3896,7 +3903,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (error "This folder is not filtered"))) (defun wl-summary-virtual (&optional arg) - "Goto virtual folder." + "Goto virtual folder. +If ARG, exit virtual folder." (interactive "P") (if arg (wl-summary-unvirtual) @@ -3941,7 +3949,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (delq pair wl-summary-buffer-refile-list)))))))) (defun wl-summary-mark-line (mark) - "Put MARK on current line. Returns message number." + "Put MARK on current line. Return message number." (save-excursion (beginning-of-line) (let ((inhibit-read-only t) @@ -3953,7 +3961,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (setq cur-mark (wl-match-buffer 2)) (goto-char (match-end 1)) (delete-region (match-beginning 2) (match-end 2)) - ;(wl-summary-delete-mark msg-num) +;;; (wl-summary-delete-mark msg-num) (insert mark) (if wl-summary-highlight (wl-highlight-summary-current-line nil nil t)) @@ -4116,7 +4124,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (setq mlist wl-summary-buffer-target-mark-list) (while mlist (wl-summary-mark-as-unread (car mlist)) - ;; (wl-thread-msg-mark-as-unread (car mlist)) +;;; (wl-thread-msg-mark-as-unread (car mlist)) (setq wl-summary-buffer-target-mark-list (delq (car mlist) wl-summary-buffer-target-mark-list)) (setq mlist (cdr mlist))) @@ -4189,7 +4197,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (folder wl-summary-buffer-folder-name) (msgdb wl-summary-buffer-msgdb) (mark-alist (elmo-msgdb-get-mark-alist msgdb)) - ;;(number-alist (elmo-msgdb-get-number-alist msgdb)) +;;; (number-alist (elmo-msgdb-get-number-alist msgdb)) (case-fold-search nil) mark stat visible uncached new-mark marked) (if number @@ -4574,8 +4582,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (let* ((dir (elmo-msgdb-expand-path wl-summary-buffer-folder-name)) (cache (expand-file-name wl-summary-cache-file dir)) (view (expand-file-name wl-summary-view-file dir)) - ;;(coding-system-for-write wl-cs-cache) - ;;(output-coding-system wl-cs-cache) +;;; (coding-system-for-write wl-cs-cache) +;;; (output-coding-system wl-cs-cache) (save-view wl-summary-buffer-view) (tmp-buffer (get-buffer-create " *wl-summary-save-view-cache*")) (charset wl-summary-buffer-mime-charset)) @@ -4752,10 +4760,10 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (if wl-summary-buffer-disp-msg (progn (wl-summary-redisplay) - ;; hide your folder window -;; (setq fld-buf (get-buffer wl-folder-buffer-name)) -;; (if (setq fld-win (get-buffer-window fld-buf)) -;; (delete-window fld-win))) +;;; hide your folder window +;;; (setq fld-buf (get-buffer wl-folder-buffer-name)) +;;; (if (setq fld-win (get-buffer-window fld-buf)) +;;; (delete-window fld-win))) (run-hooks 'wl-summary-toggle-disp-on-hook)) (wl-delete-all-overlays) (save-excursion @@ -4763,7 +4771,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (delete-window) (select-window (get-buffer-window cur-buf)) (run-hooks 'wl-summary-toggle-disp-off-hook)) - ;;(switch-to-buffer cur-buf) +;;; (switch-to-buffer cur-buf) ))))) (defun wl-summary-next-line-content () @@ -4896,8 +4904,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (errmsg (format "No message with id \"%s\" in the folder." msgid))) (if (setq msg (car (rassoc msgid number-alist))) - ;;(wl-summary-jump-to-msg-internal - ;;wl-summary-buffer-folder-name msg 'no-sync) +;;; (wl-summary-jump-to-msg-internal +;;; wl-summary-buffer-folder-name msg 'no-sync) (progn (wl-thread-jump-to-msg msg) t) @@ -5071,7 +5079,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (defun wl-summary-reply (&optional arg without-setup-hook) "Reply to current message. Default is \"wide\" reply. -Reply to author if invoked with argument." +Reply to author if invoked with ARG." (interactive "P") (let ((folder wl-summary-buffer-folder-name) (number (wl-summary-message-number)) @@ -5103,6 +5111,7 @@ Reply to author if invoked with argument." (mail-position-on-field "To")) (defun wl-summary-write-current-newsgroup (&optional folder) + "" (interactive) (let* ((folder (or folder wl-summary-buffer-folder-name)) (flist (elmo-folder-get-primitive-folder-list folder)) @@ -5125,6 +5134,7 @@ Reply to author if invoked with argument." (error "%s is not newsgroup" folder)))) (defun wl-summary-forward (&optional without-setup-hook) + "" (interactive) (let ((folder wl-summary-buffer-folder-name) (number (wl-summary-message-number)) @@ -5162,6 +5172,7 @@ Reply to author if invoked with argument." (wl-summary-read)) (defun wl-summary-read () + "" (interactive) (let ((folder wl-summary-buffer-folder-name) (number (wl-summary-message-number)) @@ -5186,12 +5197,13 @@ Reply to author if invoked with argument." (progn (if (wl-summary-next-page) (wl-summary-down t))) -; (wl-summary-scroll-up-content))) +;;; (wl-summary-scroll-up-content))) (if (wl-summary-no-mime-p folder) (wl-summary-redisplay-no-mime folder number) (wl-summary-redisplay-internal folder number))))) (defun wl-summary-prev (&optional interactive) + "" (interactive) (if wl-summary-move-direction-toggle (setq wl-summary-move-direction-downward nil)) @@ -5231,6 +5243,7 @@ Reply to author if invoked with argument." (wl-summary-entity-info-msg next-entity finfo)))))))) (defun wl-summary-next (&optional interactive) + "" (interactive) (if wl-summary-move-direction-toggle (setq wl-summary-move-direction-downward t)) @@ -5270,6 +5283,7 @@ Reply to author if invoked with argument." (wl-summary-entity-info-msg next-entity finfo)))))))) (defun wl-summary-up (&optional interactive skip-no-unread) + "" (interactive) (if wl-summary-move-direction-toggle (setq wl-summary-move-direction-downward nil)) @@ -5581,7 +5595,7 @@ Reply to author if invoked with argument." (wl-summary-set-message-buffer-or-redisplay) (set-buffer (wl-message-get-original-buffer)) (if (and (null arg) (file-exists-p filename)) - (if (y-or-n-p "file already exists. override it?") + (if (y-or-n-p "File already exists. override it? ") (write-region (point-min) (point-max) filename)) (write-region (point-min) (point-max) filename))) (message "No message to save.")) @@ -5638,10 +5652,10 @@ Reply to author if invoked with argument." (save-excursion (wl-summary-set-message-buffer-or-redisplay) (if (or (not (interactive-p)) - (y-or-n-p "Print ok?")) + (y-or-n-p "Print ok? ")) (progn (let* ((message-buffer (get-buffer wl-message-buf-name)) - ;; (summary-buffer (get-buffer wl-summary-buffer-name)) +;;; (summary-buffer (get-buffer wl-summary-buffer-name)) (buffer (generate-new-buffer " *print*"))) (set-buffer message-buffer) (copy-to-buffer buffer (point-min) (point-max)) @@ -5656,11 +5670,11 @@ Reply to author if invoked with argument." (message "No message.") (setq filename (ps-print-preprint current-prefix-arg)) (if (or (not (interactive-p)) - (y-or-n-p "Print ok?")) + (y-or-n-p "Print ok? ")) (let ((summary-buffer (current-buffer)) wl-break-pages) (save-excursion - ;;(wl-summary-set-message-buffer-or-redisplay) +;;; (wl-summary-set-message-buffer-or-redisplay) (wl-summary-redisplay-internal) (let* ((message-buffer (get-buffer wl-message-buf-name)) (buffer (generate-new-buffer " *print*")) @@ -5840,7 +5854,7 @@ Reply to author if invoked with argument." orig-buf tmp-buf t (= i k))) nil - (error "Can't find begin line."))) + (error "Can't find begin line"))) ((< i k) (wl-message-uu-substring orig-buf tmp-buf)) (t ; last @@ -5873,7 +5887,7 @@ Reply to author if invoked with argument." wl-prog-uudecode-arg)))) (when (not (= 0 rc)) (setq errmsg (buffer-substring (point-min)(point-max))) - (error "uudecode error: %s" errmsg)) + (error "Uudecode error: %s" errmsg)) (if (not wl-prog-uudecode-no-stdout-option) (let (file-name-handler-alist) ;; void jka-compr (as-binary-output-file @@ -5892,7 +5906,7 @@ Reply to author if invoked with argument." (if (elmo-folder-pipe-p wl-summary-buffer-folder-name) (error "You cannot drop unsync messages in this folder")) (if (or (not (interactive-p)) - (y-or-n-p "Drop all unsync messages?")) + (y-or-n-p "Drop all unsync messages? ")) (let* ((folder-list (elmo-folder-get-primitive-folder-list wl-summary-buffer-folder-name)) (is-multi (elmo-multi-p wl-summary-buffer-folder-name)) @@ -5962,7 +5976,7 @@ Reply to author if invoked with argument." (defun wl-cache-prefetch-next (fld msg &optional summary) (if (wl-cache-prefetch-p fld) (if (not elmo-use-buffer-cache) - ;; (message "`elmo-use-buffer-cache' is nil, cache prefetch is disable.") +;;; (message "`elmo-use-buffer-cache' is nil, cache prefetch is disable.") (save-excursion (set-buffer (or summary (get-buffer wl-summary-buffer-name))) (let ((next (funcall wl-cache-prefetch-get-next-func msg))) diff --git a/wl/wl-template.el b/wl/wl-template.el index bb47963..b8be5ed 100644 --- a/wl/wl-template.el +++ b/wl/wl-template.el @@ -52,6 +52,7 @@ (define-key wl-template-mode-map "\n" 'wl-template-set)) (defun wl-template-apply (name) + "Apply NAME templete to draft." (let (template) (when name (if (string= name "") @@ -85,6 +86,7 @@ Enterring WL-Template mode calls the value of `wl-template-mode-hook'." (run-hooks 'wl-template-mode-hook)) (defun wl-template-select () + "Select templete from `wl-template-alist'." (interactive) (if (not wl-template-visible-select) (wl-template-apply @@ -120,7 +122,8 @@ Enterring WL-Template mode calls the value of `wl-template-mode-hook'." (wl-template-show)))) (defun wl-template-show (&optional arg) - "Show reference INDEX in wl-template-alist." + "Show reference INDEX in `wl-template-alist'. +ARG is ignored." ; ARG ignored this version (?) (save-excursion (set-buffer wl-template-buffer-name) (let ((buffer-read-only nil) @@ -180,6 +183,8 @@ Enterring WL-Template mode calls the value of `wl-template-mode-hook'." (if win (select-window win)))))) (defun wl-template-insert (name &optional mail-header) + "Insert NAME templete. +Set header-separator is MAIL-HEADER." (let ((template (cdr (assoc name wl-template-alist))) (mail-header-separator (or mail-header mail-header-separator))) diff --git a/wl/wl-thread.el b/wl/wl-thread.el index 8c616ee..df5c7f1 100644 --- a/wl/wl-thread.el +++ b/wl/wl-thread.el @@ -33,7 +33,7 @@ (require 'wl-highlight) ;; buffer local variables. -;(defvar wl-thread-top-entity '(nil t nil nil)) ; top entity +;;(defvar wl-thread-top-entity '(nil t nil nil)) ; top entity (defvar wl-thread-tops nil) ; top number list (number) (defvar wl-thread-entities nil) (defvar wl-thread-entity-list nil) ; entity list @@ -469,8 +469,8 @@ ENTITY is returned." ret-val)) (defun wl-thread-jump-to-prev-unread (&optional hereto) - "If prev unread is a children of a closed message, -the closed parent will be opened." + "If prev unread is a children of a closed message. +The closed parent will be opened." (interactive "P") (let ((msg (wl-thread-get-prev-unread (wl-summary-message-number) hereto))) @@ -534,8 +534,8 @@ the closed parent will be opened." ret-val)) (defun wl-thread-jump-to-next-unread (&optional hereto) - "If next unread is a children of a closed message, -the closed parent will be opened." + "If next unread is a children of a closed message. +The closed parent will be opened." (interactive "P") (let ((msg (wl-thread-get-next-unread (wl-summary-message-number) hereto))) @@ -735,12 +735,12 @@ the closed parent will be opened." (let ((i 0) (updates msgs) len) -;; (while msgs -;; (setq updates -;; (append updates -;; (wl-thread-get-children-msgs (car msgs)))) -;; (setq msgs (cdr msgs))) -;; (setq updates (elmo-uniq-list updates)) +;;; (while msgs +;;; (setq updates +;;; (append updates +;;; (wl-thread-get-children-msgs (car msgs)))) +;;; (setq msgs (cdr msgs))) +;;; (setq updates (elmo-uniq-list updates)) (setq len (length updates)) (while updates (wl-thread-update-line-on-buffer-sub nil (car updates)) @@ -803,8 +803,8 @@ the closed parent will be opened." (setq parent (wl-thread-entity-get-parent-entity entity)) (if parent (progn - ;; has parent. - ;;(setq brothers (wl-thread-entity-get-children parent)) +;;; has parent. +;;; (setq brothers (wl-thread-entity-get-children parent)) (setq older-brothers (wl-thread-entity-get-older-brothers entity parent)) (setq younger-brothers (wl-thread-entity-get-younger-brothers @@ -927,10 +927,10 @@ When optional argument UPDATE is non-nil, Message is inserted to the summary buffer." (let ((parent (wl-thread-get-entity parent-msg)) child-entity invisible-top) -;; Update the thread view...not implemented yet. -; (when force-insert -; (if parent -; (wl-thread-entity-force-open parent)) +;;; Update the thread view...not implemented yet. +;;; (when force-insert +;;; (if parent +;;; (wl-thread-entity-force-open parent)) (if parent ;; insert as children. (wl-thread-entity-insert-as-children @@ -955,11 +955,11 @@ Message is inserted to the summary buffer." ;; use thread structure. (wl-thread-entity-get-nearly-older-brother child-entity parent))) ; return value -;; (wl-thread-entity-get-number -;; (wl-thread-entity-get-top-entity parent)))) ; return value; -;; (setq beg (point)) -;; (wl-thread-goto-bottom-of-sub-thread) -;; (wl-thread-update-indent-string-region beg (point))) +;;; (wl-thread-entity-get-number +;;; (wl-thread-entity-get-top-entity parent)))) ; return value; +;;; (setq beg (point)) +;;; (wl-thread-goto-bottom-of-sub-thread) +;;; (wl-thread-update-indent-string-region beg (point))) ;; currently invisible.. update closed line. (wl-thread-update-children-number invisible-top) nil)))) @@ -1177,7 +1177,7 @@ Message is inserted to the summary buffer." (setq overview-entity (elmo-msgdb-overview-get-entity (nth 0 entity) wl-summary-buffer-msgdb)) - ;;(wl-delete-all-overlays) +;;; (wl-delete-all-overlays) (when overview-entity (setq summary-line (wl-summary-overview-create-summary-line @@ -1232,15 +1232,15 @@ Message is inserted to the summary buffer." (throw 'done t))) nil))) -; (defun wl-thread-goto-bottom-of-sub-thread () -; (interactive) -; (let ((depth (wl-thread-get-depth-of-current-line))) -; (forward-line 1) -; (while (and (not (eobp)) -; (> (wl-thread-get-depth-of-current-line) -; depth)) -; (forward-line 1)) -; (beginning-of-line))) +;; (defun wl-thread-goto-bottom-of-sub-thread () +;; (interactive) +;; (let ((depth (wl-thread-get-depth-of-current-line))) +;; (forward-line 1) +;; (while (and (not (eobp)) +;; (> (wl-thread-get-depth-of-current-line) +;; depth)) +;; (forward-line 1)) +;; (beginning-of-line))) (defun wl-thread-goto-bottom-of-sub-thread (&optional msg) (interactive) @@ -1369,8 +1369,8 @@ Message is inserted to the summary buffer." (defun wl-thread-open-close (&optional force-open) (interactive "P") (when (eq wl-summary-buffer-view 'thread) - ;(if (equal wl-thread-top-entity '(nil t nil nil)) - ;(error "There's no thread structure.")) +;;; (if (equal wl-thread-top-entity '(nil t nil nil)) +;;; (error "There's no thread structure")) (save-excursion (let ((inhibit-read-only t) (buffer-read-only nil) diff --git a/wl/wl-util.el b/wl/wl-util.el index 2b0ff82..831cbde 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -66,8 +66,8 @@ (nreverse list))) (defun wl-delete-duplicates (list &optional all hack-addresses) - "Delete duplicate equivalent strings from the list. -If ALL is t, then if there is more than one occurrence of a string in the list, + "Delete duplicate equivalent strings from the LIST. +If ALL is t, then if there is more than one occurrence of a string in the LIST, then all occurrences of it are removed instead of just the subsequent ones. If HACK-ADDRESSES is t, then the strings are considered to be mail addresses, and only the address part is compared (so that \"Name \" and \"foo\" @@ -170,9 +170,11 @@ If HACK-ADDRESSES is t, then the strings are considered to be mail addresses, (fset 'wl-read-event-char 'wl-xmas-read-event-char)) (defmacro wl-push (v l) + "Insert V at the head of the list stored in L." (list 'setq l (list 'cons v l))) (defmacro wl-pop (l) + "Remove the head of the list stored in L." (list 'car (list 'prog1 l (list 'setq l (list 'cdr l))))) (defun wl-ask-folder (func mes-string) @@ -191,13 +193,13 @@ If HACK-ADDRESSES is t, then the strings are considered to be mail addresses, (wl-push (cdr keve) unread-command-events)))) ;(defalias 'wl-make-hash 'elmo-make-hash) -;(make-obsolete 'wl-make-hash 'elmo-make-hash) +;;(make-obsolete 'wl-make-hash 'elmo-make-hash) -;(defalias 'wl-get-hash-val 'elmo-get-hash-val) -;(make-obsolete 'wl-get-hash-val 'elmo-get-hash-val) +;;(defalias 'wl-get-hash-val 'elmo-get-hash-val) +;;(make-obsolete 'wl-get-hash-val 'elmo-get-hash-val) -;(defalias 'wl-set-hash-val 'elmo-set-hash-val) -;(make-obsolete 'wl-set-hash-val 'elmo-set-hash-val) +;;(defalias 'wl-set-hash-val 'elmo-set-hash-val) +;;(make-obsolete 'wl-set-hash-val 'elmo-set-hash-val) (defsubst wl-set-string-width (width string) (elmo-set-work-buf @@ -286,7 +288,7 @@ If HACK-ADDRESSES is t, then the strings are considered to be mail addresses, value))) (defmacro wl-match-string (pos string) - "Substring POSth matched string." + "Substring POSth matched STRING." (` (substring (, string) (match-beginning (, pos)) (match-end (, pos))))) (defmacro wl-match-buffer (pos) @@ -414,8 +416,9 @@ changing the value of `foo'." alist) (defun wl-inverse-alist (keys alist) - "Inverse ALIST, copying. Return an association list represents -the inverse mapping of ALIST, from objects to KEYS. + "Inverse ALIST, copying. +Return an association list represents the inverse mapping of ALIST, +from objects to KEYS. The objects mapped (cdrs of elements of the ALIST) are shared." (let (x y tmp result) (while keys @@ -671,6 +674,7 @@ that `read' can handle, whenever this is possible." ".wl"))) (defun wl-draft-make-message-id-string () + "Return Message-ID field value." (concat "<" (wl-unique-id) "@" (or wl-message-id-domain (if wl-local-domain @@ -681,10 +685,12 @@ that `read' can handle, whenever this is possible." ;;; Profile loading. (defvar wl-load-profile-func 'wl-local-load-profile) (defun wl-local-load-profile () + "Load `wl-init-file'." (message "Initializing ...") (load wl-init-file 'noerror 'nomessage)) (defun wl-load-profile () + "Call `wl-load-profile-func' function." (funcall wl-load-profile-func)) ;;; diff --git a/wl/wl-vars.el b/wl/wl-vars.el index 4b56702..e87d8a2 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -123,7 +123,7 @@ (defvar wl-cs-cache wl-cs-local) (defvar wl-use-semi (module-installed-p 'mime-view) ; If nil, use tm. - "*Use SEMI or not") + "*Use SEMI or not.") (defcustom wl-from (if (boundp 'user-mail-address) user-mail-address) @@ -189,7 +189,7 @@ If you don't have multiple e-mail addresses, you don't have to set this." ;; Important folders (defcustom wl-default-folder "%inbox" - "*Default folder used in wl-summary-goto-folder." + "*Default folder used in `wl-summary-goto-folder'." :type 'string :group 'wl) (defcustom wl-draft-folder "+draft" @@ -226,19 +226,19 @@ If you don't have multiple e-mail addresses, you don't have to set this." :group 'wl-draft) (defcustom wl-auto-insert-x-face t - "*Insert X-Face: field automatically" + "*Insert X-Face: field automatically." :type 'boolean :group 'wl-draft) (defcustom wl-x-face-file "~/.xface" - "*If file exists and `wl-auto-insert-x-face' is non-nil, -X-Face field is inserted using its contents." + "*X-Face field is inserted using its contents. +If file exists and `wl-auto-insert-x-face' is non-nil." :type 'file :group 'wl-draft) (defcustom wl-subscribed-mailing-list nil - "*Subscribed mailing list. You had better set this variable -if you set wl-insert-mail-followup-to as t." + "*Subscribed mailing list. +You had better set this variable if you set 'wl-insert-mail-followup-to' as t." :type '(repeat string) :group 'wl-pref) @@ -249,7 +249,7 @@ if you set wl-insert-mail-followup-to as t." (defcustom wl-envelope-from nil "*Envelope From used in SMTP. -If nil, wl-from is used." +If nil, `wl-from' is used." :type '(choice (const :tag "Same as 'From' field." nil) string) :group 'wl) @@ -269,7 +269,7 @@ If nil, default smtp connection type is used." :group 'wl) (defcustom wl-smtp-posting-user nil - "*SMTP authentication user. " + "*SMTP authentication user." :type '(choice (const :tag "none" nil) string) :group 'wl) @@ -299,7 +299,7 @@ If nil, don't authenticate." (defcustom wl-pop-before-smtp-user nil "*POP3 user name to send mail using POP-before-SMTP. -If nil, elmo-default-pop3-user is used. +If nil, `elmo-default-pop3-user' is used. To use POP-before-SMTP, (setq wl-draft-send-mail-func 'wl-draft-send-mail-with-pop-before-smtp)" :type '(choice (const :tag "none" nil) @@ -308,27 +308,27 @@ To use POP-before-SMTP, (defcustom wl-pop-before-smtp-server nil "*POP3 server for POP-before-SMTP. -If nil, elmo-default-pop3-server is used." +If nil, `elmo-default-pop3-server' is used." :type '(choice (const :tag "none" nil) string) :group 'wl) (defcustom wl-pop-before-smtp-port nil "*POP3 port for POP-before-SMTP. -If nil, elmo-default-pop3-port is used." +If nil, `elmo-default-pop3-port' is used." :type '(choice (const :tag "none" nil) integer string) :group 'wl) (defcustom wl-pop-before-smtp-stream-type nil "*Stream type for POP-before-SMTP. -If nil, elmo-default-pop3-stream-type is used." +If nil, `elmo-default-pop3-stream-type' is used." :type 'boolean :group 'wl) (defcustom wl-pop-before-smtp-authenticate-type nil - "*Default Authentication type for POP-before-SMTP -If nil, elmo-default-pop3-authenticate-type is used." + "*Default Authentication type for POP-before-SMTP. +If nil, `elmo-default-pop3-authenticate-type' is used." :type '(choice (const :tag "none" nil) (const :tag "APOP" "apop") (const :tag "POP3" "user")) @@ -336,26 +336,26 @@ If nil, elmo-default-pop3-authenticate-type is used." (defcustom wl-nntp-posting-server nil "*NNTP server name to post news. -If nil, elmo-default-nntp-server is used." +If nil, `elmo-default-nntp-server' is used." :type '(choice (const :tag "none" nil) string) :group 'wl) (defcustom wl-nntp-posting-user nil "*NNTP user name to post news for authinfo. -If nil, elmo-default-nntp-user is used. +If nil, `elmo-default-nntp-user' is used. If nil, don't authenticate." :type '(choice (const :tag "none" nil) string) :group 'wl) (defcustom wl-nntp-posting-port nil "*NNTP port to post news. -If nil, elmo-default-nntp-port is used." +If nil, `elmo-default-nntp-port' is used." :type '(choice (const :tag "none" nil) integer string) :group 'wl) (defcustom wl-nntp-posting-stream-type nil "*Stream type for posting Netnews. -If nil, elmo-default-nntp-stream-type is used." +If nil, `elmo-default-nntp-stream-type' is used." :type 'boolean :group 'wl) @@ -395,9 +395,10 @@ when `wl-prefetch-confirm' is non-nil." ;;;; Hooks (defvar wl-folder-mode-hook nil - "A hook called when wanderlust folder mode is started. This hook may -contain the functions `wl-folder-init-icons' and `wl-setup-folder' for -reasons of system internal to accord facilities for the Emacs variants.") + "A hook called when wanderlust folder mode is started. +This hook may contain the functions `wl-folder-init-icons' and +`wl-setup-folder' for reasons of system internal to accord facilities +for the Emacs variants.") (defvar wl-summary-toggle-disp-on-hook nil "A hook called when message is toggled.") (defvar wl-summary-toggle-disp-off-hook nil @@ -409,9 +410,9 @@ reasons of system internal to accord facilities for the Emacs variants.") (defvar wl-summary-toggle-disp-folder-message-resumed-hook nil "A hook called when message window is resumed when folder is toggled.") (defvar wl-summary-mode-hook nil - "A hook called when summary mode is started. This hook may contain -the function `wl-setup-summary' for reasons of system internal to -accord facilities for the Emacs variants.") + "A hook called when summary mode is started. +This hook may contain the function `wl-setup-summary' for reasons of +system internal to accord facilities for the Emacs variants.") (defvar wl-summary-prepared-pre-hook nil "A hook called before the summary buffer has been generated.") @@ -496,9 +497,10 @@ accord facilities for the Emacs variants.") (defvar wl-score-mode-hook nil "A hook called when score mode is started.") (defvar wl-make-plugged-hook nil - "A hook called when make plugged alist. This hook may contain the -functions `wl-plugged-init-icons' and `wl-biff-init-icons' for reasons -of system internal to accord facilities for the Emacs variants.") + "A hook called when make plugged alist. +This hook may contain the functions `wl-plugged-init-icons' and +`wl-biff-init-icons' for reasons of system internal to accord +facilities for the Emacs variants.") (defvar wl-plugged-exit-hook nil "A hook called when exit plugged mode.") @@ -603,7 +605,7 @@ Default is for 'followup-to-me'." :group 'wl-draft) (defcustom wl-draft-resume-folder-window t - "*Resume folder window in wl-draft-hide" + "*Resume folder window in `wl-draft-hide'." :type 'boolean :group 'wl-draft) @@ -618,7 +620,7 @@ Default is for 'followup-to-me'." :group 'wl-draft) (defcustom wl-draft-remove-group-list-contents t - "*If non-nil, remove group list contents in `wl-draft-send-mail-with-smtp'" + "*If non-nil, remove group list contents in `wl-draft-send-mail-with-smtp'." :type 'boolean :group 'wl-draft) @@ -629,17 +631,17 @@ Default is for 'followup-to-me'." :group 'wl) (defcustom wl-folders-file "~/.folders" - "*Folders file" + "*Folders file." :type 'file :group 'wl) (defcustom wl-address-file "~/.addresses" - "*Addresses file" + "*Addresses file." :type 'file :group 'wl) (defcustom wl-alias-file "~/.im/Aliases" - "*Alias file for completion" + "*Alias file for completion." :type 'file :group 'wl) @@ -761,13 +763,14 @@ This variable is local to the summary buffers." :group 'wl-pref) (defcustom wl-summary-rescore-partial-threshold 200 - "*Summary is not scored entirely if there are messages more than this value -in sync-all or rescan." + "*Summary is not scored entirely if there are messages more than this value. +In sync-all or rescan." :type 'integer :group 'wl-score) (defcustom wl-score-files-dir (concat elmo-msgdb-dir elmo-path-sep) - "*Name of the directory where score files will be stored (default \"~/.elmo\")." + "*Name of the directory where score files will be stored. +(default \"~/.elmo\")." :type 'directory :group 'wl) @@ -932,7 +935,7 @@ ex. :group 'wl-pref) (defcustom wl-draft-reply-buffer-style 'split - "'split or 'full" + "'split or 'full." :type '(radio (const split) (const full)) :group 'wl-draft) @@ -940,7 +943,7 @@ ex. (defcustom wl-draft-queue-save-variables '(wl-envelope-from wl-from wl-smtp-posting-server wl-smtp-posting-user wl-smtp-posting-port - wl-smtp-authenticate-type wl-smtp-connection-type + wl-smtp-authenticate-type wl-smtp-connection-type wl-pop-before-smtp-server wl-pop-before-smtp-user wl-pop-before-smtp-port wl-pop-before-smtp-stream-type wl-pop-before-smtp-authenticate-type wl-nntp-posting-server wl-nntp-posting-server @@ -960,7 +963,7 @@ ex. :group 'wl-draft) (defcustom wl-summary-default-number-column 5 - "number of columns in summary buffer." + "Number of columns in summary buffer." :type 'integer :group 'wl-summary) @@ -980,14 +983,13 @@ ex. :group 'wl-highlight) (defcustom wl-summary-highlight-partial-threshold 1000 - "Summary is not highlighted entirely -if there are lines more than this value." + "Summary is not highlighted entirely if there are lines more than this value." :type 'integer :group 'wl-summary :group 'wl-highlight) (defcustom wl-summary-partial-highlight-above-lines 30 - "If Summary has lines more than wl-summary-highlight-partial-threshold, + "If Summary has lines more than `wl-summary-highlight-partial-threshold', Summary lines are highlighted partialy above current position." :type 'integer :group 'wl-summary @@ -1008,19 +1010,19 @@ Summary lines are highlighted partialy above current position." :type 'file :group 'wl-summary) (defcustom wl-summary-view-file ".wl-summary-view" - "*current summary view." + "*Current summary view." :type 'file :group 'wl-summary) (defcustom wl-thread-top-file ".wl-thread-top" - "*current thread top entity... obsolete." + "*Current thread top entity... obsolete." :type 'file :group 'wl-summary) (defcustom wl-thread-entity-file ".wl-thread-entity" - "*thread entities." + "*Thread entities." :type 'file :group 'wl-summary) (defcustom wl-thread-entity-list-file ".wl-thread-entity-list" - "*thread top entity list." + "*Thread top entity list." :type 'file :group 'wl-summary) @@ -1043,8 +1045,8 @@ Summary lines are highlighted partialy above current position." (defcustom wl-use-folder-petname '(modeline) - "*List of situation using folder petname. Allowed situations are: - + "*List of situation using folder petname. +Allowed situations are: modeline : displayed on modeline. ask-folder : displayed on minibuffer when ask folder. read-folder : can used for completion at `wl-summary-read-folder'." @@ -1055,7 +1057,7 @@ Summary lines are highlighted partialy above current position." :group 'wl-pref) (defcustom wl-folder-petname-alist nil - "A list of (realname . petname)" + "A list of (realname . petname)." :type '(repeat (cons (string :tag "Realname") (string :tag "Petname"))) :group 'wl-folder) @@ -1093,13 +1095,13 @@ Set this if (system-name) does not return FQDN." :group 'wl-pref) (defcustom wl-message-window-size '(1 . 4) - "*Size of summary and message window. cons cell of (Summary : Message)." + "*Size of summary and message window. cons cell of (Summary : Message)." :type '(cons integer integer) :group 'wl-pref) (defcustom wl-message-sort-field-list '("Return-Path" "Received" "^To" "^Cc" "Newsgroups" "Subject" "^From") - "*Sort order of header fields. Each elements are regexp of field name. + "*Sort order of header fields. Each elements are regexp of field name. (Not valid on tm.)" :type '(repeat (string :tag "Field Regexp")) :group 'wl-pref) @@ -1123,7 +1125,7 @@ Each elements are regexp of field-name." :group 'wl-pref) (defcustom wl-summary-recenter t - "*Recenter on redisplay" + "*Recenter on redisplay." :type 'boolean :group 'wl-summary :group 'wl-pref) @@ -1241,7 +1243,7 @@ with wl-highlight-folder-many-face." (defcustom wl-highlight-background-mode (if (boundp 'hilit-background-mode) (or hilit-background-mode 'dark) 'dark) - "*Background mode of highlight (for Old Emacsen). 'dark or 'light" + "*Background mode of highlight (for Old Emacsen). 'dark or 'light." :type '(radio (const dark) (const light)) :group 'wl-highlight) @@ -1269,7 +1271,7 @@ might set this variable to '(\"-f\" \"you@some.where\")." (defcustom wl-rejected-letter-start "^[\t ]*-+[\t ]+\\(original\\|\\(\\(the \\)?unsent\\)\\) message\\( follows\\)?[\t ]+-+[\t ]*$" "Regexp specifying the beginning of the wrapper around a returned letter. - This wrapper is generated by the mail system when rejecting a letter." +This wrapper is generated by the mail system when rejecting a letter." :type 'regexp :group 'wl-draft) @@ -1313,7 +1315,7 @@ the message is skipped at cursor move." (defcustom wl-summary-incorporate-marks (list wl-summary-new-mark wl-summary-unread-uncached-mark) - "Persistent marks to prefetch at `wl-summary-incorporate'" + "Persistent marks to prefetch at `wl-summary-incorporate'." :type '(repeat (string :tag "Mark")) :group 'wl-summary) @@ -1392,7 +1394,7 @@ Each elements are regexp of folder name." (defcustom wl-biff-check-folder-list nil "All folders that match this list are automatically checked -every intervals specified by wl-biff-check-interval. " +every intervals specified by wl-biff-check-interval." :type '(repeat (regexp :tag "Folder Regexp")) :group 'wl-highlight) @@ -1465,7 +1467,7 @@ It uses wl-summary-move-direction-downward as a direction flag." (defcustom wl-auto-select-next nil "*If non-nil, offer to go to the next folder from the end of the previous. If the value is the symbol `unread', go to the next folder -that no unread message exists. If the value is the symbol `skip-no-unread', +that no unread message exists. If the value is the symbol `skip-no-unread', skip the folder that no unread message exists. See also variable `wl-summary-next-no-unread-command'." @@ -1530,7 +1532,7 @@ Each elements are regexp of folder name." ("^-relcom\\." . koi8-r) ("^-tw\\." . big5) ("^-han\\." . euc-kr)) - "Charset alist. If no match, wl-mime-charset is used." + "Charset alist. If no match, `wl-mime-charset' is used." :type '(repeat (cons (regexp :tag "Folder Regexp") (symbol :tag "Charset"))) :group 'wl-summary :group 'wl-pref) @@ -1540,8 +1542,8 @@ Each elements are regexp of folder name." ("^-relcom\\." . "en") ("^-tw\\." . "en") ("^-han\\." . "en")) - "Weekday name lang alist. If no match, wl-summary-weekday-name-lang -is used. + "Weekday name lang alist. +If no match, `wl-summary-weekday-name-lang' is used. e.x. '((\"xemacs-beta$\" . \"en\") (\"^-fj\" . \"ja\"))" @@ -1581,7 +1583,7 @@ e.x. (list (cons (concat "^" (regexp-quote wl-draft-folder) "$\\|^" (regexp-quote wl-queue-folder) "$") "all")) - "*Default sync range alist. If no matches, `wl-default-sync-range' is used." + "*Default sync range alist. If no matches, `wl-default-sync-range' is used." :type '(repeat (cons (regexp :tag "Folder Regexp") (choice (const "update") (const "all") @@ -1640,7 +1642,7 @@ or 'skip-no-unread." :group 'wl-summary) (defcustom wl-summary-search-via-nntp 'confirm - "*Non-nil, search message via nntp after `wl-summary-jump-to-msg-by-message-id'. If the value is 'confirm, confirm before search." + "*Non-nil, search message via nntp after `wl-summary-jump-to-msg-by-message-id'. If the value is 'confirm, confirm before search." :type 'boolean :group 'wl-summary) @@ -1693,7 +1695,7 @@ ex. (defcustom wl-refile-policy-alist '(("^[-=']" . copy) (".*" . move)) - "*List of refile policy. Each element is (FOLDER-REGEXP . POLICY). + "*List of refile policy. Each element is (FOLDER-REGEXP . POLICY). POLICY is copy or move." :type '(repeat (cons (regexp :tag "Folder Regexp") (choice (const copy) @@ -1790,7 +1792,7 @@ Each element is (folder-regexp (number or date) policy). The policy is one of the followings: 'remove : remove messsage. -'trash : refile wl-trash-folder. +'trash : refile `wl-trash-folder'. string : refile string folder. function : call function. @@ -1940,7 +1942,7 @@ list : reserved specified permanent marks." ;; highilght about draft and message (defcustom wl-highlight-body-too t - "*In addition to header, highlight the body too. if non nil." + "*In addition to header, highlight the body too. if non nil." :type 'boolean :group 'wl-highlight) @@ -1977,7 +1979,7 @@ list : reserved specified permanent marks." (defcustom wl-highlight-highlight-citation-too nil "*Whether the whole citation line should go in the - `wl-highlight-citation-face' face. +`wl-highlight-citation-face' face. If nil, the text matched by `wl-highlight-citation-prefix-regexp' is in the default face, and the remainder of the line is in the wl-highlight-message-cited-text face." @@ -2006,7 +2008,7 @@ the `wl-highlight-message-headers' face." "*If the message header is larger than this many chars, don't highlight it. If this is nil, all headers will be highlighted." :type 'integer - :group 'wl-highlight) + :group 'wl-highlight) (defcustom wl-highlight-max-message-size 10000 "*If the message body is larger than this many chars, don't highlight it. @@ -2024,7 +2026,7 @@ It will be verified from head to tail looking for a separator. Verification will be done from the end of the buffer. No need to specify \"^-- $\" in this list, because it is verified by default. -This variable can also be a regex. " +This variable can also be a regex." :type '(repeat regexp) :group 'wl-highlight) @@ -2049,8 +2051,8 @@ This variable can also be a regex. " :type 'boolean :group 'wl-highlight) (defcustom wl-highlight-folder-by-numbers t - "Highlight folder lines by numbers. If it is a number, only numbers -will be highlighted." + "Highlight folder lines by numbers. +If it is a number, only numbers will be highlighted." :type '(choice (const :tag "whole line" t) (const :tag "only numbers" 1) (const :tag "don't highlight" nil)) @@ -2080,8 +2082,9 @@ will be highlighted." 'xpm 'xbm)) (and (module-installed-p 'bitmap) 'xbm)) - "If non-nil, show graphic logo in the startup screen. You can set it to -a symbol `xbm' to limit the image format to XBM even if XPM can be shown." + "If non-nil, show graphic logo in the startup screen. +You can set it to a symbol `xbm' to limit the image format to +XBM even if XPM can be shown." :type '(radio (const :tag "OFF" nil) (const :tag "XBM (possibly BITMAP-MULE)" xbm) (sexp :format "ON (any format)" :value t)) @@ -2107,15 +2110,15 @@ a symbol `xbm' to limit the image format to XBM even if XPM can be shown." (defvar wl-thread-indent-level 1 "*Indent level for thread.") (defvar wl-thread-have-younger-brother-str "┣" - "*A string for thread branch line. It should contain one character.") + "*A string for thread branch line. It should contain one character.") (defvar wl-thread-youngest-child-str "┗" - "*A string for thread branch line. It should contain one character.") + "*A string for thread branch line. It should contain one character.") (defvar wl-thread-vertical-str "┃" - "*A string for thread branch line. It should contain one character.") + "*A string for thread branch line. It should contain one character.") (defvar wl-thread-horizontal-str "━" - "*A string for thread branch line. It should contain one character.") + "*A string for thread branch line. It should contain one character.") (defvar wl-thread-space-str "　" - "*A string for thread branch line. It should contain one character.") + "*A string for thread branch line. It should contain one character.") (defvar wl-highlight-thread-indent-string-regexp "[^[<]*" "* A regexp string for thread indent...for highlight.") @@ -2164,9 +2167,9 @@ a symbol `xbm' to limit the image format to XBM even if XPM can be shown." (defvar wl-biff-nomail-icon "no-letter.xpm" "*Icon file for no mail existed state.") (defvar wl-prog-uudecode "uudecode" - "*uudecode program name") + "*uudecode program name.") (defvar wl-prog-uudecode-arg '("-p") ;; outout is stdout. - "*arguments for uudecode program") + "*Arguments for uudecode program.") (defvar wl-prog-uudecode-no-stdout-option nil "*If non-nil, uudecode program don't have option for output to stdout.") diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index 51d037d..f4977a7 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -61,8 +61,8 @@ wl-folder-prev-entity t "Previous Folder"] [wl-folder-check-current-entity wl-folder-check-current-entity t "Check Current Folder"] - ;;[wl-draft - ;; wl-draft t "Write a New Message"] +;;; [wl-draft +;;; wl-draft t "Write a New Message"] [wl-folder-sync-current-entity wl-folder-sync-current-entity t "Sync Current Folder"] [wl-draft -- 1.7.10.4