From: kaoru Date: Tue, 5 Jan 2010 09:27:58 +0000 (+0000) Subject: * wl.el (wl-toggle-plugged, wl-plugged-dop-queue-info) X-Git-Tag: elmo-imap4-compliance-root~31 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c8f934ee400f2a4598a1d21f84c104a9fa77388;p=elisp%2Fwanderlust.git * wl.el (wl-toggle-plugged, wl-plugged-dop-queue-info) (wl-plugged-exit, wl-exit): Fix comment-out style. Use three semicolons, that should start at the left margin. See. also (Info-goto-node "(elisp)Comment Tips"). * wl-acap.el (wl-acap-store): Ditto. * wl-action.el (wl-summary-unset-mark): Ditto. * wl-address.el (wl-address-ldap-search): Ditto. * wl-demo.el (wl-demo-insert-image): Ditto. * wl-dnd.el (wl-dnd-set-drag-starter): Ditto. * wl-draft.el (wl-draft-normal-send-func, wl-draft-send) (wl-draft-previous-history-element): Ditto. * wl-e21.el (wl-draft-key-setup, wl-draft-overload-functions): Ditto. * wl-folder.el (toplevel, wl-folder-mode-menu-spec) (wl-folder-mode-map, wl-folder-get-prev-folder) (wl-folder-jump-to-current-entity, wl-folder-check-entity) (wl-folder-check-entity-async) (wl-create-folder-entity-from-buffer): Ditto. * wl-fldmgr.el (toplevel): Ditto. * wl-message.el (wl-message-buffer-cache-sort) (wl-message-redisplay, wl-message-buffer-prefetch-clear-timer): Ditto. * wl-mule.el (wl-draft-key-setup, wl-draft-overload-functions): Ditto. * wl-summary.el (toplevel, wl-summary-mode) (wl-summary-edit-addresses, wl-summary-sync-update) (wl-summary-stick): Ditto. * wl-thread.el (toplevel, wl-thread-insert-message) (wl-thread-insert-entity-sub, wl-thread-open-close): Ditto. * wl-util.el (toplevel): Ditto. * wl-xmas.el (wl-draft-key-setup, wl-draft-overload-functions): Ditto. --- diff --git a/wl/ChangeLog b/wl/ChangeLog index 965e0b7..7a96187 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,37 @@ +2010-01-05 TAKAHASHI Kaoru + + * wl.el (wl-toggle-plugged, wl-plugged-dop-queue-info) + (wl-plugged-exit, wl-exit): Fix comment-out style. Use three + semicolons, that should start at the left margin. + See. also (Info-goto-node "(elisp)Comment Tips"). + * wl-acap.el (wl-acap-store): Ditto. + * wl-action.el (wl-summary-unset-mark): Ditto. + * wl-address.el (wl-address-ldap-search): Ditto. + * wl-demo.el (wl-demo-insert-image): Ditto. + * wl-dnd.el (wl-dnd-set-drag-starter): Ditto. + * wl-draft.el (wl-draft-normal-send-func, wl-draft-send) + (wl-draft-previous-history-element): Ditto. + * wl-e21.el (wl-draft-key-setup, wl-draft-overload-functions): Ditto. + * wl-folder.el (toplevel, wl-folder-mode-menu-spec) + (wl-folder-mode-map, wl-folder-get-prev-folder) + (wl-folder-jump-to-current-entity, wl-folder-check-entity) + (wl-folder-check-entity-async) + (wl-create-folder-entity-from-buffer): Ditto. + * wl-fldmgr.el (toplevel): Ditto. + * wl-message.el (wl-message-buffer-cache-sort) + (wl-message-redisplay, wl-message-buffer-prefetch-clear-timer): + Ditto. + * wl-mule.el (wl-draft-key-setup, wl-draft-overload-functions): + Ditto. + * wl-summary.el (toplevel, wl-summary-mode) + (wl-summary-edit-addresses, wl-summary-sync-update) + (wl-summary-stick): Ditto. + * wl-thread.el (toplevel, wl-thread-insert-message) + (wl-thread-insert-entity-sub, wl-thread-open-close): Ditto. + * wl-util.el (toplevel): Ditto. + * wl-xmas.el (wl-draft-key-setup, wl-draft-overload-functions): + Ditto. + 2010-01-04 TAKAHASHI Kaoru * Version number is increased to 2.15.8. diff --git a/wl/wl-acap.el b/wl/wl-acap.el index f9be6c2..4c9605e 100644 --- a/wl/wl-acap.el +++ b/wl/wl-acap.el @@ -390,11 +390,11 @@ If nil, default acap port is used." (nreverse settings))) (message "Storing folders...") (wl-acap-store-folders proc) - ;; Does not work correctly?? - ;; (acap-setacl proc (list - ;; (concat - ;; "/" wl-acap-dataset-class "/~/")) - ;; "anyone" "") ; protect. +;;; Does not work correctly?? +;;; (acap-setacl proc (list +;;; (concat +;;; "/" wl-acap-dataset-class "/~/")) +;;; "anyone" "") ; protect. ) (acap-close proc)) (if (interactive-p) diff --git a/wl/wl-action.el b/wl/wl-action.el index 223abe5..27fe11d 100644 --- a/wl/wl-action.el +++ b/wl/wl-action.el @@ -251,11 +251,11 @@ Return number if put mark succeed" (when (wl-summary-action-argument-function action) (wl-summary-remove-argument))) (set-buffer-modified-p nil)))) - ;; Move the cursor. - ;; (if (or interactive (interactive-p)) - ;; (if (eq wl-summary-move-direction-downward nil) - ;; (wl-summary-prev) - ;; (wl-summary-next)))) +;;; Move the cursor. +;;; (if (or interactive (interactive-p)) +;;; (if (eq wl-summary-move-direction-downward nil) +;;; (wl-summary-prev) +;;; (wl-summary-next)))) ) (defun wl-summary-make-destination-numbers-list (mark-list) diff --git a/wl/wl-address.el b/wl/wl-address.el index ec77db5..c63c5f1 100644 --- a/wl/wl-address.el +++ b/wl/wl-address.el @@ -266,7 +266,7 @@ Matched address lists are append to CL." ;; make mail addrses list (while mails (if (null (assoc (car mails) cl)); Not already in cl. - ;; (string-match regexp (car mails)) +;;; (string-match regexp (car mails)) ;; add mail address itself to completion list (setq result (cons (cons (car mails) (concat cn " <" (car mails) ">")) diff --git a/wl/wl-demo.el b/wl/wl-demo.el index 60178f6..38f78c0 100644 --- a/wl/wl-demo.el +++ b/wl/wl-demo.el @@ -236,11 +236,11 @@ Return a number of lines that an image occupies in the buffer." ;; Emacs 21.x may fail on computing the end of the ;; column if there're bitmap characters. - ;;(setq width 0) - ;;(while (progn - ;; (end-of-line 0) - ;; (not (bobp))) - ;; (setq width (max width (current-column)))) +;;; (setq width 0) +;;; (while (progn +;;; (end-of-line 0) +;;; (not (bobp))) +;;; (setq width (max width (current-column)))) (setq width 1024) (while (progn (end-of-line 0) diff --git a/wl/wl-dnd.el b/wl/wl-dnd.el index 5090a28..cf159f1 100644 --- a/wl/wl-dnd.el +++ b/wl/wl-dnd.el @@ -93,7 +93,7 @@ (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 4d9ca99..c47f41c 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -1167,7 +1167,7 @@ If FORCE-MSGID, insert message-id regardless of `wl-insert-message-id'." nil t) (when (string= "" (match-string 1)) (replace-match "")))) -;;; (run-hooks 'wl-mail-send-pre-hook) ;; X-PGP-Sig, Cancel-Lock +;;; (run-hooks 'wl-mail-send-pre-hook) ; X-PGP-Sig, Cancel-Lock (wl-draft-dispatch-message) (when kill-when-done ;; hide editing-buffer. @@ -1300,9 +1300,9 @@ This variable is valid when `wl-interactive-send' has non-nil value." "Send current draft message. If KILL-WHEN-DONE is non-nil, current draft buffer is killed" (interactive) - ;; Don't call this explicitly. - ;; Added to 'wl-draft-send-hook (by teranisi) - ;; (wl-draft-config-exec) +;;; Don't call this explicitly. +;;; Added to 'wl-draft-send-hook (by teranisi) +;;; (wl-draft-config-exec) (run-hooks 'wl-draft-send-hook) (when (or (not wl-interactive-send) (wl-draft-send-confirm)) @@ -2438,8 +2438,8 @@ Automatically applied in draft sending time." ((looking-at wl-folder-complete-header-regexp) (and (boundp 'wl-read-folder-history) (setq history wl-read-folder-history))) - ;; ((looking-at wl-address-complete-header-regexp) - ;; (setq history .....)) +;;; ((looking-at wl-address-complete-header-regexp) +;;; (setq history .....)) (t nil))) (eolp)) diff --git a/wl/wl-e21.el b/wl/wl-e21.el index c385827..325475c 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -657,7 +657,7 @@ Special commands: (define-key wl-draft-mode-map "\C-c\C-j" 'wl-template-select) (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message) (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr) -;; (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save) +;;; (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save) (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer) (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region) (define-key wl-draft-mode-map "\C-a" 'wl-draft-beginning-of-line) @@ -666,7 +666,7 @@ Special commands: (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) -;; (local-set-key "\C-c\C-s" 'wl-draft-send);; override +;;; (local-set-key "\C-c\C-s" 'wl-draft-send) ; override (wl-e21-setup-draft-toolbar) (wl-draft-overload-menubar)) diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index 77e25ca..1989a36 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -243,29 +243,29 @@ return value is diffs '(-new -unread -all)." (setq result-path (cdr result-path)) (setq entities (wl-pop entity-stack))))))))) -;; (defun wl-fldmgr-get-previous-entity (entity key-id) -;; (cdr (wl-fldmgr-get-previous-entity-internal '(nil . nil) entity key-id))) -;; -;; (defun wl-fldmgr-get-previous-entity-internal (result entity key-id) -;; (cond -;; ((stringp entity) -;; (if (eq key-id (wl-fldmgr-get-entity-id entity)) -;; (cons t result) -;; (cons nil (cons entity entity)))) -;; ((consp entity) -;; (if (eq key-id (wl-fldmgr-get-entity-id (car entity))) -;; (cons t result) -;; (setcar result (car entity)) -;; (let ((flist (nth 2 entity)) -;; return found) -;; (while (and flist (not found)) -;; (if (car (setq return -;; (wl-fldmgr-get-previous-entity-internal -;; result (car flist) key-id))) -;; (setq found t)) -;; (setq result (cdr return)) -;; (setq flist (cdr flist))) -;; (cons found result)))))) +;;;(defun wl-fldmgr-get-previous-entity (entity key-id) +;;; (cdr (wl-fldmgr-get-previous-entity-internal '(nil . nil) entity key-id))) +;;; +;;;(defun wl-fldmgr-get-previous-entity-internal (result entity key-id) +;;; (cond +;;; ((stringp entity) +;;; (if (eq key-id (wl-fldmgr-get-entity-id entity)) +;;; (cons t result) +;;; (cons nil (cons entity entity)))) +;;; ((consp entity) +;;; (if (eq key-id (wl-fldmgr-get-entity-id (car entity))) +;;; (cons t result) +;;; (setcar result (car entity)) +;;; (let ((flist (nth 2 entity)) +;;; return found) +;;; (while (and flist (not found)) +;;; (if (car (setq return +;;; (wl-fldmgr-get-previous-entity-internal +;;; result (car flist) key-id))) +;;; (setq found t)) +;;; (setq result (cdr return)) +;;; (setq flist (cdr flist))) +;;; (cons found result)))))) ;; path is get `wl-fldmgr-get-path-from-buffer'. (defun wl-fldmgr-update-group (path diffs) diff --git a/wl/wl-folder.el b/wl/wl-folder.el index caa0234..7eac53f 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -88,7 +88,7 @@ ["Next Folder" wl-folder-next-entity t] ["Check Current Folder" wl-folder-check-current-entity t] ["Sync Current Folder" wl-folder-sync-current-entity t] -; ["Drop Current Folder" wl-folder-drop-unsync-current-entity t] +;;; ["Drop Current Folder" wl-folder-drop-unsync-current-entity t] ["Prefetch Current Folder" wl-folder-prefetch-current-entity t] "----" ["Mark as Read all Current Folder" wl-folder-mark-as-read-all-current-entity t] @@ -147,7 +147,7 @@ nil (setq wl-folder-mode-map (make-sparse-keymap)) (define-key wl-folder-mode-map " " 'wl-folder-jump-to-current-entity) -; (define-key wl-folder-mode-map "\M- " 'wl-folder-open-close) +;;; (define-key wl-folder-mode-map "\M- " 'wl-folder-open-close) (define-key wl-folder-mode-map "/" 'wl-folder-open-close) (define-key wl-folder-mode-map "\C-m" 'wl-folder-jump-to-current-entity) (define-key wl-folder-mode-map [(shift return)] 'wl-folder-jump-to-current-entity-with-arg) @@ -169,7 +169,7 @@ (define-key wl-folder-mode-map "rs" 'wl-folder-check-region) (define-key wl-folder-mode-map "s" 'wl-folder-check-current-entity) (define-key wl-folder-mode-map "I" 'wl-folder-prefetch-current-entity) -; (define-key wl-folder-mode-map "D" 'wl-folder-drop-unsync-current-entity) +;;; (define-key wl-folder-mode-map "D" 'wl-folder-drop-unsync-current-entity) (define-key wl-folder-mode-map "p" 'wl-folder-prev-entity) (define-key wl-folder-mode-map "n" 'wl-folder-next-entity) (define-key wl-folder-mode-map "v" 'wl-folder-toggle-disp-summary) @@ -445,9 +445,9 @@ Default HASHTB is `wl-folder-elmo-folder-hashtb'." (setq entity (wl-pop entities)) (cond ((consp entity) -;; (if (and (string= name (car entity)) -;; (eq id (wl-folder-get-entity-id (car entity)))) -;; (throw 'done last-entity)) +;;; (if (and (string= name (car entity)) +;;; (eq id (wl-folder-get-entity-id (car entity)))) +;;; (throw 'done last-entity)) (and entities (wl-push entities entity-stack)) (setq entities (nth 2 entity))) @@ -671,14 +671,14 @@ Optional argument ARG is repeart count." (wl-folder-update-newest indent entity) (wl-folder-insert-entity indent entity)) (wl-highlight-folder-path wl-folder-buffer-cur-path)) - ; (quit - ; (setq err t) - ; (setcdr (assoc fld-name wl-folder-group-alist) nil)) - ; (error - ; (elmo-display-error errobj t) - ; (ding) - ; (setq err t) - ; (setcdr (assoc fld-name wl-folder-group-alist) nil))) +;;; (quit +;;; (setq err t) +;;; (setcdr (assoc fld-name wl-folder-group-alist) nil)) +;;; (error +;;; (elmo-display-error errobj t) +;;; (ding) +;;; (setq err t) +;;; (setcdr (assoc fld-name wl-folder-group-alist) nil))) (if (not err) (let ((buffer-read-only nil)) (delete-region (save-excursion (beginning-of-line) @@ -701,8 +701,8 @@ Optional argument ARG is repeart count." (wl-folder-insert-entity indent entity) ; insert entity (forward-line -1) (wl-highlight-folder-path wl-folder-buffer-cur-path) - ; (wl-delete-all-overlays) - ; (wl-highlight-folder-current-line) +;;; (wl-delete-all-overlays) +;;; (wl-highlight-folder-current-line) )) ;; ordinal folder (wl-folder-set-current-entity-id @@ -839,8 +839,8 @@ Optional argument ARG is repeart count." ret-val (wl-folder-check-entity (car flist)))) (setq flist (cdr flist))) - ;(wl-folder-buffer-search-entity (car entity)) - ;(wl-folder-update-line ret-val) +;;; (wl-folder-buffer-search-entity (car entity)) +;;; (wl-folder-update-line ret-val) )) ((stringp entity) (message "Checking \"%s\"" entity) @@ -949,7 +949,7 @@ Optional argument ARG is repeart count." ret-val (wl-folder-check-one-entity (elmo-folder-name-internal folder)))) - ;;(sit-for 0) +;;; (sit-for 0) )) ;; check network entity at last (when async-folder-list @@ -963,7 +963,7 @@ Optional argument ARG is repeart count." ret-val (wl-folder-check-one-entity (elmo-folder-name-internal folder)))) - ;;(sit-for 0) +;;; (sit-for 0) ))) ret-val)) @@ -1263,16 +1263,16 @@ If current line is group folder, all subfolders are marked." (let (name) (setq name (wl-match-buffer 1)) (goto-char (+ 1 (match-end 0))) -; (condition-case () -; (unwind-protect -; (setq flist (elmo-list-folders name))) -; (error (message "Access to folder %s failed." name))) -;; (setq flist (elmo-msgdb-flist-load name)) ; load flist. -;; (setq unsublist (nth 1 flist)) -;; (setq flist (car flist)) -;; (list name 'access flist unsublist))) +;;; (condition-case () +;;; (unwind-protect +;;; (setq flist (elmo-list-folders name))) +;;; (error (message "Access to folder %s failed." name))) +;;; (setq flist (elmo-msgdb-flist-load name)) ; load flist. +;;; (setq unsublist (nth 1 flist)) +;;; (setq flist (car flist)) +;;; (list name 'access flist unsublist))) (append (list name 'access) (wl-create-access-folder-entity name)))) - ;((looking-at "^[\t ]*\\([^\t \n}]+\\)[\t ]*\\(\"[^\"]*\"\\)?[\t ]*$") ; normal folder entity +;;; ((looking-at "^[\t ]*\\([^\t \n}]+\\)[\t ]*\\(\"[^\"]*\"\\)?[\t ]*$") ; normal folder entity ((looking-at "^[\t ]*=[ \t]+\\([^\n]+\\)$"); petname definition (goto-char (+ 1 (match-end 0))) (let ((rest (elmo-match-buffer 1)) @@ -1905,31 +1905,31 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." hashtb)) ;; Unsync number is reserved. -;;(defun wl-folder-reconstruct-entity-hashtb (entity &optional hashtb id-name) -;; (let* ((hashtb (or hashtb (elmo-make-hash wl-folder-entity-id))) -;; (entities (list entity)) -;; entity-stack) -;; (while entities -;; (setq entity (wl-pop entities)) -;; (cond -;; ((consp entity) -;; (if id-name -;; (wl-folder-set-id-name (wl-folder-get-entity-id (car entity)) -;; (car entity))) -;; (and entities -;; (wl-push entities entity-stack)) -;; (setq entities (nth 2 entity)) -;; ) -;; ((stringp entity) -;; (wl-folder-set-entity-info entity -;; (wl-folder-get-entity-info entity) -;; hashtb) -;; (if id-name -;; (wl-folder-set-id-name (wl-folder-get-entity-id entity) -;; entity)))) -;; (unless entities -;; (setq entities (wl-pop entity-stack)))) -;; hashtb)) +;;;(defun wl-folder-reconstruct-entity-hashtb (entity &optional hashtb id-name) +;;; (let* ((hashtb (or hashtb (elmo-make-hash wl-folder-entity-id))) +;;; (entities (list entity)) +;;; entity-stack) +;;; (while entities +;;; (setq entity (wl-pop entities)) +;;; (cond +;;; ((consp entity) +;;; (if id-name +;;; (wl-folder-set-id-name (wl-folder-get-entity-id (car entity)) +;;; (car entity))) +;;; (and entities +;;; (wl-push entities entity-stack)) +;;; (setq entities (nth 2 entity)) +;;; ) +;;; ((stringp entity) +;;; (wl-folder-set-entity-info entity +;;; (wl-folder-get-entity-info entity) +;;; hashtb) +;;; (if id-name +;;; (wl-folder-set-id-name (wl-folder-get-entity-id entity) +;;; entity)))) +;;; (unless entities +;;; (setq entities (wl-pop entity-stack)))) +;;; hashtb)) (defun wl-folder-create-newsgroups-from-nntp-access (entity) (let ((flist (nth 2 entity)) @@ -2794,50 +2794,50 @@ If current line is group folder, all subfolders are prefetched." (wl-folder-check-entity entity)) (wl-folder-prefetch-entity entity))))) -;(defun wl-folder-drop-unsync-entity (entity) -; "Drop all unsync messages in the ENTITY." -; (cond -; ((consp entity) -; (let ((flist (nth 2 entity))) -; (while flist -; (wl-folder-drop-unsync-entity (car flist)) -; (setq flist (cdr flist))))) -; ((stringp entity) -; (let ((nums (wl-folder-get-entity-info entity)) -; wl-summary-highlight wl-auto-select-first new) -; (setq new (or (car nums) 0)) -; (if (< 0 new) -; (save-window-excursion -; (save-excursion -; (let ((wl-summary-buffer-name (concat -; wl-summary-buffer-name -; (symbol-name this-command)))) -; (wl-summary-goto-folder-subr entity 'no-sync nil) -; (wl-summary-drop-unsync) -; (wl-summary-exit))))))))) - -;(defun wl-folder-drop-unsync-current-entity (&optional force-check) -; "Drop all unsync messages in the folder at position. -;If current line is group folder, all subfolders are dropped. -;If optional arg exists, don't check any folders." -; (interactive "P") -; (save-excursion -; (let ((entity-name (wl-folder-get-entity-from-buffer)) -; (group (wl-folder-buffer-group-p)) -; wl-folder-check-entity-hook -; summary-buf entity) -; (when (and entity-name -; (y-or-n-p (format -; "Drop all unsync messages in %s? " entity-name))) -; (setq entity -; (if group -; (wl-folder-search-group-entity-by-name entity-name -; wl-folder-entity) -; entity-name)) -; (if (null force-check) -; (wl-folder-check-entity entity)) -; (wl-folder-drop-unsync-entity entity) -; (message "All unsync messages in %s are dropped!" entity-name))))) +;;;(defun wl-folder-drop-unsync-entity (entity) +;;; "Drop all unsync messages in the ENTITY." +;;; (cond +;;; ((consp entity) +;;; (let ((flist (nth 2 entity))) +;;; (while flist +;;; (wl-folder-drop-unsync-entity (car flist)) +;;; (setq flist (cdr flist))))) +;;; ((stringp entity) +;;; (let ((nums (wl-folder-get-entity-info entity)) +;;; wl-summary-highlight wl-auto-select-first new) +;;; (setq new (or (car nums) 0)) +;;; (if (< 0 new) +;;; (save-window-excursion +;;; (save-excursion +;;; (let ((wl-summary-buffer-name (concat +;;; wl-summary-buffer-name +;;; (symbol-name this-command)))) +;;; (wl-summary-goto-folder-subr entity 'no-sync nil) +;;; (wl-summary-drop-unsync) +;;; (wl-summary-exit))))))))) + +;;;(defun wl-folder-drop-unsync-current-entity (&optional force-check) +;;; "Drop all unsync messages in the folder at position. +;;;If current line is group folder, all subfolders are dropped. +;;;If optional arg exists, don't check any folders." +;;; (interactive "P") +;;; (save-excursion +;;; (let ((entity-name (wl-folder-get-entity-from-buffer)) +;;; (group (wl-folder-buffer-group-p)) +;;; wl-folder-check-entity-hook +;;; summary-buf entity) +;;; (when (and entity-name +;;; (y-or-n-p (format +;;; "Drop all unsync messages in %s? " entity-name))) +;;; (setq entity +;;; (if group +;;; (wl-folder-search-group-entity-by-name entity-name +;;; wl-folder-entity) +;;; entity-name)) +;;; (if (null force-check) +;;; (wl-folder-check-entity entity)) +;;; (wl-folder-drop-unsync-entity entity) +;;; (message "All unsync messages in %s are dropped!" entity-name))))) (defun wl-folder-write-current-folder () "Write message to current folder's newsgroup or mailing-list. diff --git a/wl/wl-message.el b/wl/wl-message.el index e357740..71748aa 100644 --- a/wl/wl-message.el +++ b/wl/wl-message.el @@ -106,14 +106,14 @@ With association ((\"folder\" message \"message-id\") . cache-buffer).") "Move ENTRY to the top of `wl-message-buffer-cache'." (setq wl-message-buffer-cache (cons entry (delete entry wl-message-buffer-cache)))) -; (let* ((pointer (cons nil wl-message-buffer-cache)) -; (top pointer)) -; (while (cdr pointer) -; (if (equal (car (cdr pointer)) entry) -; (setcdr pointer (cdr (cdr pointer))) -; (setq pointer (cdr pointer)))) -; (setcdr pointer (list entry)) -; (setq wl-message-buffer-cache (cdr top)))) +;;; (let* ((pointer (cons nil wl-message-buffer-cache)) +;;; (top pointer)) +;;; (while (cdr pointer) +;;; (if (equal (car (cdr pointer)) entry) +;;; (setcdr pointer (cdr (cdr pointer))) +;;; (setq pointer (cdr pointer)))) +;;; (setcdr pointer (list entry)) +;;; (setq wl-message-buffer-cache (cdr top)))) (defconst wl-original-message-buffer-name " *Original*") @@ -511,9 +511,9 @@ Returns non-nil if bottom of message." wl-message-mode-line-format-spec-alist) (setq mode-line-buffer-identification (funcall wl-message-buffer-mode-line-formatter)) - ;; highlight body -; (when wl-highlight-body-too -; (wl-highlight-body)) +;;; ;; highlight body +;;; (when wl-highlight-body-too +;;; (wl-highlight-body)) (ignore-errors (wl-message-narrow-to-page)) (goto-char (point-min)) (when (re-search-forward "^$" nil t) @@ -653,8 +653,8 @@ Returns non-nil if bottom of message." (t wl-message-buffer-prefetch-folder-list))))) (defsubst wl-message-buffer-prefetch-clear-timer () -;;; cannot use for the bug of fsf-compat package (1.09). -;;; (cancel-function-timers 'wl-message-buffer-prefetch-subr) +;;; cannot use for the bug of fsf-compat package (1.09). +;;; (cancel-function-timers 'wl-message-buffer-prefetch-subr) (if (fboundp 'run-with-idle-timer) (if (featurep 'xemacs) (let ((p itimer-list)) diff --git a/wl/wl-mule.el b/wl/wl-mule.el index c37c710..1c70621 100644 --- a/wl/wl-mule.el +++ b/wl/wl-mule.el @@ -162,7 +162,7 @@ Special commands: (define-key wl-draft-mode-map "\C-c\C-e" 'wl-draft-config-exec) (define-key wl-draft-mode-map "\C-c\C-j" 'wl-template-select) (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message) -;; (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save) +;;; (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save) (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr) (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer) (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region) @@ -199,7 +199,7 @@ Special commands: (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) -;; (local-set-key "\C-c\C-s" 'wl-draft-send);; override +;;; (local-set-key "\C-c\C-s" 'wl-draft-send) ; override (wl-draft-overload-menubar)) ;; for "ja-mule-canna-2.3.mini" on PocketBSD diff --git a/wl/wl-summary.el b/wl/wl-summary.el index dd1eeba..0930360 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -932,13 +932,13 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (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) (when (boundp 'show-trailing-whitespace) (setq show-trailing-whitespace nil)) -;;;(make-local-variable 'tab-width) -;;;(setq tab-width 1) +;;; (make-local-variable 'tab-width) +;;; (setq tab-width 1) (buffer-disable-undo (current-buffer)) (setq selective-display t selective-display-ellipses nil) @@ -1526,7 +1526,7 @@ Optional argument ADDR-STR is used as a target address if specified." (nth 0 address) result))) ;;; i'd like to update summary-buffer, but... -;;; (wl-summary-rescan) +;;; (wl-summary-rescan) (run-hooks 'wl-summary-edit-addresses-hook)))))) (defun wl-summary-incorporate (&optional arg) @@ -1961,8 +1961,8 @@ This function is defined for `window-scroll-functions'" (error "(Internal error) Folder is not set:%s" (buffer-name (current-buffer)))) ;; Flush pending append operations (disconnected operation). - ;;(setq seen-list - ;;(wl-summary-flush-pending-append-operations seen-list)) +;;; (setq seen-list +;;; (wl-summary-flush-pending-append-operations seen-list)) (goto-char (point-max)) (wl-folder-confirm-existence folder (elmo-folder-plugged-p folder)) (setq crossed (elmo-folder-synchronize folder @@ -2259,7 +2259,7 @@ If ARG, without confirm." (wl-summary-sticky-buffer-name (wl-summary-buffer-folder-name))) ;;; ???hang up -;;; (rename-buffer (wl-summary-sticky-buffer-name +;;; (rename-buffer (wl-summary-sticky-buffer-name ;;; (wl-summary-buffer-folder-name)))) (message "Folder `%s' is now sticky." (wl-summary-buffer-folder-name))))) @@ -3535,11 +3535,11 @@ Return non-nil if the mark is updated" ""))) ;;; For future use. -;;(defun wl-summary-line-cached () -;; (if (elmo-message-cached-p wl-summary-buffer-elmo-folder -;; (elmo-message-entity-number wl-message-entity)) -;; " " -;; "u")) +;;;(defun wl-summary-line-cached () +;;; (if (elmo-message-cached-p wl-summary-buffer-elmo-folder +;;; (elmo-message-entity-number wl-message-entity)) +;;; " " +;;; "u")) (defun wl-summary-create-line (wl-message-entity wl-parent-message-entity @@ -5009,41 +5009,41 @@ If ARG is numeric number, decode message as following: (message "Saved as %s" filename))) (kill-buffer tmp-buf))))) -;; Someday -;; (defun wl-summary-drop-unsync () -;; "Drop all unsync messages." -;; (interactive) -;; (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? ")) -;; (let* ((folder-list (elmo-folder-get-primitive-folder-list -;; (wl-summary-buffer-folder-name))) -;; (is-multi (elmo-multi-p (wl-summary-buffer-folder-name))) -;; (sum 0) -;; (multi-num 0) -;; pair) -;; (message "Dropping...") -;; (while folder-list -;; (setq pair (elmo-folder-message-numbers (car folder-list))) -;; (when is-multi ;; dirty hack... -;; (incf multi-num) -;; (setcar pair (+ (* multi-num elmo-multi-divide-number) -;; (car pair)))) -;; (elmo-msgdb-set-number-alist -;; (wl-summary-buffer-msgdb) -;; (nconc -;; (elmo-msgdb-get-number-alist (wl-summary-buffer-msgdb)) -;; (list (cons (car pair) nil)))) -;; (setq sum (+ sum (cdr pair))) -;; (setq folder-list (cdr folder-list))) -;; (wl-summary-set-message-modified) -;; (wl-folder-set-folder-updated (wl-summary-buffer-folder-name) -;; (list 0 -;; (+ wl-summary-buffer-unread-count -;; wl-summary-buffer-new-count) -;; sum)) -;; (message "Dropping...done")))) +;;; Someday +;;;(defun wl-summary-drop-unsync () +;;; "Drop all unsync messages." +;;; (interactive) +;;; (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? ")) +;;; (let* ((folder-list (elmo-folder-get-primitive-folder-list +;;; (wl-summary-buffer-folder-name))) +;;; (is-multi (elmo-multi-p (wl-summary-buffer-folder-name))) +;;; (sum 0) +;;; (multi-num 0) +;;; pair) +;;; (message "Dropping...") +;;; (while folder-list +;;; (setq pair (elmo-folder-message-numbers (car folder-list))) +;;; (when is-multi ;; dirty hack... +;;; (incf multi-num) +;;; (setcar pair (+ (* multi-num elmo-multi-divide-number) +;;; (car pair)))) +;;; (elmo-msgdb-set-number-alist +;;; (wl-summary-buffer-msgdb) +;;; (nconc +;;; (elmo-msgdb-get-number-alist (wl-summary-buffer-msgdb)) +;;; (list (cons (car pair) nil)))) +;;; (setq sum (+ sum (cdr pair))) +;;; (setq folder-list (cdr folder-list))) +;;; (wl-summary-set-message-modified) +;;; (wl-folder-set-folder-updated (wl-summary-buffer-folder-name) +;;; (list 0 +;;; (+ wl-summary-buffer-unread-count +;;; wl-summary-buffer-new-count) +;;; sum)) +;;; (message "Dropping...done")))) (defun wl-summary-previous-message-number (msg) "Return a message number previous to the message specified by MSG." diff --git a/wl/wl-thread.el b/wl/wl-thread.el index a9026f3..7818c1d 100644 --- a/wl/wl-thread.el +++ b/wl/wl-thread.el @@ -595,8 +595,8 @@ 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 +;;; (when force-insert +;;; (if parent ;;; (wl-thread-entity-force-open parent)) (when (and wl-summary-max-thread-depth parent) (let ((cur parent) @@ -629,8 +629,8 @@ Message is inserted to the summary buffer." parent-msg)) (when parent ;; use thread structure. - ;;(wl-thread-entity-get-nearly-older-brother - ;; child-entity parent))) ; return value +;;; (wl-thread-entity-get-nearly-older-brother +;;; child-entity parent))) ; return value (wl-thread-entity-get-number parent))) ; return value ;;; (setq beg (point)) ;;; (wl-thread-goto-bottom-of-sub-thread) @@ -639,19 +639,19 @@ Message is inserted to the summary buffer." (wl-thread-update-children-number invisible-top) nil)))) -;(defun wl-thread-get-parent-list (msgs) -; ;; return ancestors -; (let* ((msgs2 msgs) -; myself) -; (while msgs2 -; (setq myself (car msgs2) -; msgs2 (cdr msgs2)) -; (while (not (eq myself (car msgs2))) -; (if (wl-thread-descendant-p myself (car msgs2)) -; (setq msgs (delq (car msgs2) msgs))) -; (setq msgs2 (or (cdr msgs2) msgs))) -; (setq msgs2 (cdr msgs2))) -; msgs)) +;;;(defun wl-thread-get-parent-list (msgs) +;;; ;; return ancestors +;;; (let* ((msgs2 msgs) +;;; myself) +;;; (while msgs2 +;;; (setq myself (car msgs2) +;;; msgs2 (cdr msgs2)) +;;; (while (not (eq myself (car msgs2))) +;;; (if (wl-thread-descendant-p myself (car msgs2)) +;;; (setq msgs (delq (car msgs2) msgs))) +;;; (setq msgs2 (or (cdr msgs2) msgs))) +;;; (setq msgs2 (cdr msgs2))) +;;; msgs)) (defun wl-thread-get-parent-list (msgs) ;; return connected ancestors @@ -786,7 +786,7 @@ Message is inserted to the summary buffer." (setq message-entity (elmo-message-entity wl-summary-buffer-elmo-folder msg-num)) -;;; (wl-delete-all-overlays) +;;; (wl-delete-all-overlays) (when message-entity (wl-summary-insert-line (wl-summary-create-line @@ -840,15 +840,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) @@ -994,7 +994,7 @@ 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)) +;;; (if (equal wl-thread-top-entity '(nil t nil nil)) ;;; (error "There's no thread structure")) (save-excursion (let ((inhibit-read-only t) diff --git a/wl/wl-util.el b/wl/wl-util.el index 60ea66d..1613ea1 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -131,14 +131,14 @@ If HACK-ADDRESSES is t, then the strings are considered to be mail addresses, (or (string= name wl-draft-folder) (string= name wl-queue-folder))) -;(defalias 'wl-make-hash 'elmo-make-hash) -;;(make-obsolete 'wl-make-hash 'elmo-make-hash) +;;;(defalias '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 &optional padding ignore-invalid) "Make a new string which have specified WIDTH and content of STRING. diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index baa55e2..3e62300 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -538,7 +538,7 @@ Special commands: (define-key wl-draft-mode-map "\C-c\C-e" 'wl-draft-config-exec) (define-key wl-draft-mode-map "\C-c\C-j" 'wl-template-select) (define-key wl-draft-mode-map "\C-c\C-p" 'wl-draft-preview-message) -;; (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save) +;;; (define-key wl-draft-mode-map "\C-x\C-s" 'wl-draft-save) (define-key wl-draft-mode-map "\C-c\C-a" 'wl-addrmgr) (define-key wl-draft-mode-map "\C-xk" 'wl-draft-mimic-kill-buffer) (define-key wl-draft-mode-map "\C-c\C-d" 'wl-draft-elide-region) @@ -548,7 +548,7 @@ Special commands: (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) - ;; (local-set-key "\C-c\C-s" 'wl-draft-send);; override +;;; (local-set-key "\C-c\C-s" 'wl-draft-send) ; override (wl-xmas-setup-draft-toolbar) (wl-draft-overload-menubar)) diff --git a/wl/wl.el b/wl/wl.el index e33c5be..300e144 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -119,14 +119,14 @@ (if (and wl-draft-enable-queuing wl-auto-flush-queue) (wl-draft-queue-flush)) -;; (when (and (eq major-mode 'wl-summary-mode) -;; (elmo-folder-plugged-p wl-summary-buffer-elmo-folder)) -;; (let* ((msgdb-dir (elmo-folder-msgdb-path -;; wl-summary-buffer-elmo-folder)) -;; (seen-list (elmo-msgdb-seen-load msgdb-dir))) -;; (setq seen-list -;; (wl-summary-flush-pending-append-operations seen-list)) -;; (elmo-msgdb-seen-save msgdb-dir seen-list))) +;;; (when (and (eq major-mode 'wl-summary-mode) +;;; (elmo-folder-plugged-p wl-summary-buffer-elmo-folder)) +;;; (let* ((msgdb-dir (elmo-folder-msgdb-path +;;; wl-summary-buffer-elmo-folder)) +;;; (seen-list (elmo-msgdb-seen-load msgdb-dir))) +;;; (setq seen-list +;;; (wl-summary-flush-pending-append-operations seen-list)) +;;; (elmo-msgdb-seen-save msgdb-dir seen-list))) (run-hooks 'wl-plugged-hook)) (wl-biff-stop) (run-hooks 'wl-unplugged-hook)) @@ -274,7 +274,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (elmo-dop-queue (copy-sequence elmo-dop-queue)) dop-queue last alist server-info ope operation) - ;(elmo-dop-queue-load) +;;; (elmo-dop-queue-load) (elmo-dop-queue-merge) (setq dop-queue (sort elmo-dop-queue (lambda (a b) (string< (elmo-dop-queue-fname a) @@ -294,7 +294,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (if (and (car dop-queue) (string= last (elmo-dop-queue-fname (car dop-queue)))) (wl-append operation (list ope)) - ;;(setq count (1+ count)) +;;; (setq count (1+ count)) (when (and last (setq server-info (elmo-net-port-info (wl-folder-get-elmo-folder last)))) (setq alist @@ -573,8 +573,8 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (defun wl-plugged-exit () (interactive) - (setq ;;elmo-plugged-alist wl-plugged-alist - wl-plugged wl-plugged-switch + (setq wl-plugged wl-plugged-switch +;;; elmo-plugged-alist wl-plugged-alist wl-plugged-alist nil wl-plugged-sending-queue-alist nil wl-plugged-dop-queue-alist nil) @@ -689,9 +689,9 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." "\\|"))) (when wl-delete-startup-frame-function (funcall wl-delete-startup-frame-function)) -;; (if (and wl-folder-use-frame -;; (> (length (visible-frame-list)) 1)) -;; (delete-frame)) +;;; (if (and wl-folder-use-frame +;;; (> (length (visible-frame-list)) 1)) +;;; (delete-frame)) (setq wl-init nil) (remove-hook 'kill-emacs-hook 'wl-save-status) (elmo-passwd-alist-clear)