From 0fbd8fa3e611a5f03687ff7e11f98083d67bc1ce Mon Sep 17 00:00:00 2001 From: kaoru Date: Fri, 23 Nov 2001 09:02:23 +0000 Subject: [PATCH] Fixed conventional headers. Tabify and remove verbose spaces. Fixed typo in comment. * wl.el (wl-exit): Changed confirm message. --- wl/ChangeLog | 2 ++ wl/wl-acap.el | 2 +- wl/wl-address.el | 52 ++++++++++++++++++++++++++-------------------------- wl/wl-addrmgr.el | 2 +- wl/wl-demo.el | 2 +- wl/wl-dnd.el | 8 ++++---- wl/wl-draft.el | 32 ++++++++++++++++---------------- wl/wl-e21.el | 2 +- wl/wl-expire.el | 4 ++-- wl/wl-fldmgr.el | 16 ++++++++-------- wl/wl-folder.el | 10 +++++----- wl/wl-highlight.el | 4 ++-- wl/wl-message.el | 24 ++++++++++++------------ wl/wl-mime.el | 20 ++++++++++---------- wl/wl-mule.el | 5 ++--- wl/wl-refile.el | 12 ++++++------ wl/wl-score.el | 4 ++-- wl/wl-summary.el | 22 +++++++++++----------- wl/wl-template.el | 6 +++--- wl/wl-thread.el | 32 ++++++++++++++++---------------- wl/wl-util.el | 14 +++++++------- wl/wl-vars.el | 2 +- wl/wl-version.el | 2 +- wl/wl-xmas.el | 36 ++++++++++++++++++------------------ wl/wl.el | 12 ++++++------ 25 files changed, 164 insertions(+), 163 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 6cc494b..71329c9 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,7 @@ 2001-11-23 TAKAHASHI Kaoru + * wl.el (wl-exit): Changed confirm message. + * wl.el (wl-init): (require 'mime-setup) move to toplevel. * wl-draft.el (wl-draft): Remove verbose `featurep'. diff --git a/wl/wl-acap.el b/wl/wl-acap.el index aa05598..e44ed29 100644 --- a/wl/wl-acap.el +++ b/wl/wl-acap.el @@ -1,4 +1,4 @@ -;;; wl-acap.el -- ACAP support for Wanderlust. +;;; wl-acap.el --- ACAP support for Wanderlust. ;; Copyright (C) 2001 Yuuichi Teranishi diff --git a/wl/wl-address.el b/wl/wl-address.el index f5cf124..a2651a9 100644 --- a/wl/wl-address.el +++ b/wl/wl-address.el @@ -1,4 +1,4 @@ -;;; wl-address.el -- Tiny address management for Wanderlust. +;;; wl-address.el --- Tiny address management for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Shun-ichi GOTO @@ -28,10 +28,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'wl-util) (require 'wl-vars) @@ -96,7 +96,7 @@ If level 3 is required for uniqness with other candidates, values nil) (setq values (cdr values))))) ret)) - + (defun wl-ldap-get-value-list (type entry) "" (cdr (assoc type entry))) @@ -379,8 +379,8 @@ Matched address lists are append to CL." (if (null cl) nil (setq completion - (let ((completion-ignore-case t)) - (try-completion pattern cl))) + (let ((completion-ignore-case t)) + (try-completion pattern cl))) (cond ((eq completion t) (let ((alias (assoc pattern cl))) (if alias @@ -487,24 +487,24 @@ Refresh `wl-address-list', `wl-address-completion-list', and (when (< nest-count 5) (let (expn-str new-expn-str expn new-expn(n 0) (expanded nil)) (while (setq expn-str (cdr (nth n alist))) - (setq new-expn-str nil) - (while (string-match "^[ \t]*\\([^,]+\\)" expn-str) - (setq expn (elmo-match-string 1 expn-str)) + (setq new-expn-str nil) + (while (string-match "^[ \t]*\\([^,]+\\)" expn-str) + (setq expn (elmo-match-string 1 expn-str)) (setq expn-str (wl-string-delete-match expn-str 0)) - (if (string-match "^[ \t,]+" expn-str) + (if (string-match "^[ \t,]+" expn-str) (setq expn-str (wl-string-delete-match expn-str 0))) - (if (string-match "[ \t,]+$" expn) + (if (string-match "[ \t,]+$" expn) (setq expn (wl-string-delete-match expn 0))) - (setq new-expn (cdr (assoc expn alist))) - (if new-expn - (setq expanded t)) - (setq new-expn-str (concat new-expn-str (and new-expn-str ", ") - (or new-expn expn)))) - (when new-expn-str - (setcdr (nth n alist) new-expn-str)) - (setq n (1+ n))) + (setq new-expn (cdr (assoc expn alist))) + (if new-expn + (setq expanded t)) + (setq new-expn-str (concat new-expn-str (and new-expn-str ", ") + (or new-expn expn)))) + (when new-expn-str + (setcdr (nth n alist) new-expn-str)) + (setq n (1+ n))) (and expanded - (wl-address-expand-aliases alist (1+ nest-count)))))) + (wl-address-expand-aliases alist (1+ nest-count)))))) (defun wl-address-make-alist-from-alias-file (file) (elmo-set-work-buf @@ -514,7 +514,7 @@ Refresh `wl-address-list', `wl-address-completion-list', and (while (re-search-forward ",$" nil t) (end-of-line) (forward-char 1) - (delete-backward-char 1)) + (delete-backward-char 1)) (goto-char (point-min)) (while (re-search-forward "^\\([^#;\n][^:]+\\):[ \t]*\\(.*\\)$" nil t) (setq alias (wl-match-buffer 1) @@ -566,18 +566,18 @@ e.g. \"Mine Sakurai \" e.g. \"m-sakura@ccs.mt.nec.co.jp (Mine Sakurai)\" -> \"m-sakura@ccs.mt.nec.co.jp\"." (cond ((string-match ".*<\\([^>]*\\)>" str) ; .* to extract last <> - (wl-match-string 1 str)) - ((string-match "\\([^ \t\n]*@[^ \t\n]*\\)" str) (wl-match-string 1 str)) - (t str))) + ((string-match "\\([^ \t\n]*@[^ \t\n]*\\)" str) + (wl-match-string 1 str)) + (t str))) (defsubst wl-address-header-extract-realname (str) "Extracts a real name from STR and return it. e.g. \"Mr. bar \" -> \"Mr. bar\"." (cond ((string-match "\\(.*[^ \t]\\)[ \t]*<[^>]*>" str) - (wl-match-string 1 str)) - (t ""))) + (wl-match-string 1 str)) + (t ""))) (defmacro wl-address-concat-token (string token) (` (cond diff --git a/wl/wl-addrmgr.el b/wl/wl-addrmgr.el index bcc1557..276a50f 100644 --- a/wl/wl-addrmgr.el +++ b/wl/wl-addrmgr.el @@ -1,4 +1,4 @@ -;;; wl-addrmgr.el -- Address manager for Wanderlust. +;;; wl-addrmgr.el --- Address manager for Wanderlust. ;; Copyright (C) 2001 Kitamoto Tsuyoshi ;; Copyright (C) 2001 Yuuichi Teranishi diff --git a/wl/wl-demo.el b/wl/wl-demo.el index bb321d0..1661e79 100644 --- a/wl/wl-demo.el +++ b/wl/wl-demo.el @@ -1,4 +1,4 @@ -;;; wl-demo.el -- Opening demo on Wanderlust. +;;; wl-demo.el --- Opening demo on Wanderlust. ;; Copyright (C) 1998,1999,2000,2001 Yuuichi Teranishi ;; Copyright (C) 2000,2001 Katsumi Yamaoka diff --git a/wl/wl-dnd.el b/wl/wl-dnd.el index 1812df4..59402d9 100644 --- a/wl/wl-dnd.el +++ b/wl/wl-dnd.el @@ -1,4 +1,4 @@ -;;; wl-dnd.el -- dragdrop support on Wanderlust. +;;; wl-dnd.el --- dragdrop support on Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (static-cond ((featurep 'offix) @@ -99,5 +99,5 @@ (require 'product) (product-provide (provide 'wl-dnd) (require 'wl-version)) - + ;;; wl-dnd.el ends here diff --git a/wl/wl-draft.el b/wl/wl-draft.el index dbf51ba..703035e 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -1,4 +1,4 @@ -;;; wl-draft.el -- Message draft mode for Wanderlust. +;;; wl-draft.el --- Message draft mode for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Masahiro MURATA @@ -76,20 +76,20 @@ (defvar wl-draft-parent-folder nil) (defvar wl-draft-config-sub-func-alist - '((body . wl-draft-config-sub-body) - (top . wl-draft-config-sub-top) - (bottom . wl-draft-config-sub-bottom) - (header . wl-draft-config-sub-header) - (header-top . wl-draft-config-sub-header-top) - (header-bottom . wl-draft-config-sub-header) - (part-top . wl-draft-config-sub-part-top) - (part-bottom . wl-draft-config-sub-part-bottom) - (body-file . wl-draft-config-sub-body-file) - (top-file . wl-draft-config-sub-top-file) - (bottom-file . wl-draft-config-sub-bottom-file) - (header-file . wl-draft-config-sub-header-file) - (template . wl-draft-config-sub-template) - (x-face . wl-draft-config-sub-x-face))) + '((body . wl-draft-config-sub-body) + (top . wl-draft-config-sub-top) + (bottom . wl-draft-config-sub-bottom) + (header . wl-draft-config-sub-header) + (header-top . wl-draft-config-sub-header-top) + (header-bottom . wl-draft-config-sub-header) + (part-top . wl-draft-config-sub-part-top) + (part-bottom . wl-draft-config-sub-part-bottom) + (body-file . wl-draft-config-sub-body-file) + (top-file . wl-draft-config-sub-top-file) + (bottom-file . wl-draft-config-sub-bottom-file) + (header-file . wl-draft-config-sub-header-file) + (template . wl-draft-config-sub-template) + (x-face . wl-draft-config-sub-x-face))) (make-variable-buffer-local 'wl-draft-buffer-file-name) (make-variable-buffer-local 'wl-draft-buffer-cur-summary-buffer) @@ -895,7 +895,7 @@ from current buffer." "Get address list suitable for smtp RCPT TO:
. Group list content is removed if `wl-draft-remove-group-list-contents' is non-nil." - (let ((fields '("to" "cc" "bcc")) + (let ((fields '("to" "cc" "bcc")) (resent-fields '("resent-to" "resent-cc" "resent-bcc")) (case-fold-search t) addrs recipients) diff --git a/wl/wl-e21.el b/wl/wl-e21.el index a27c93f..11b8939 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -1,4 +1,4 @@ -;;; wl-e21.el -- Wanderlust modules for Emacs 21. +;;; wl-e21.el --- Wanderlust modules for Emacs 21. ;; Copyright (C) 2000,2001 Katsumi Yamaoka ;; Copyright (C) 2000,2001 Yuuichi Teranishi diff --git a/wl/wl-expire.el b/wl/wl-expire.el index b2ca640..9af4fde 100644 --- a/wl/wl-expire.el +++ b/wl/wl-expire.el @@ -1,4 +1,4 @@ -;;; wl-expire.el -- Message expire modules for Wanderlust. +;;; wl-expire.el --- Message expire modules for Wanderlust. ;; Copyright (C) 1998,1999,2000 Masahiro MURATA ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -25,7 +25,7 @@ ;; ;;; Commentary: -;; +;; (require 'wl-summary) (require 'wl-thread) diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index 1526e11..b08ee38 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -1,4 +1,4 @@ -;;; wl-fldmgr.el -- Folder manager for Wanderlust. +;;; wl-fldmgr.el --- Folder manager for Wanderlust. ;; Copyright 1998,1999,2000 Masahiro MURATA ;; Yuuichi Teranishi @@ -25,10 +25,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'wl-folder) (require 'wl-summary) @@ -410,7 +410,7 @@ return value is diffs '(-new -unread -all)." (setq unsubscribes (delete (elmo-string (car new2)) unsubscribes))) (setq new2 (cdr new2))) - (setcdr (cddr entity) (list unsubscribes)) + (setcdr (cddr entity) (list unsubscribes)) (wl-fldmgr-add-modified-access-list group)) (if (not key-path);; insert group top (if (cddr entity) @@ -891,9 +891,9 @@ return value is diffs '(-new -unread -all)." ;;; (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 - indent - group-entity t) + (wl-folder-insert-entity + indent + group-entity t) (setq wl-fldmgr-modified t) (set-buffer-modified-p nil))))))))) (t ;; folder @@ -931,7 +931,7 @@ return value is diffs '(-new -unread -all)." (type 'group) group tmp indent path new prev-id flist diffs) (setq tmp (wl-fldmgr-get-path-from-buffer t)) - (setq path (car tmp)) + (setq path (car tmp)) (setq indent (wl-fldmgr-make-indent (nth 1 tmp))) (setq prev-id (nth 3 tmp)) (if (eq (cdr (nth 2 tmp)) 'access) diff --git a/wl/wl-folder.el b/wl/wl-folder.el index 21a34ea..d86f63e 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -1,4 +1,4 @@ -;;; wl-folder.el -- Folder mode for Wanderlust. +;;; wl-folder.el --- Folder mode for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Masahiro MURATA @@ -290,7 +290,7 @@ (defun wl-folder-persistent-p (folder) (or (and (wl-folder-search-entity-by-name folder wl-folder-entity 'folder) - t) ; on Folder mode. + t) ; on Folder mode. (catch 'found (let ((li wl-save-folder-list)) (while li @@ -892,7 +892,7 @@ Optional argument ARG is repeart count." (setq ret-val (wl-folder-add-folder-info ret-val - (wl-folder-check-one-entity (elmo-folder-name-internal + (wl-folder-check-one-entity (elmo-folder-name-internal folder)))) ;;(sit-for 0) )) @@ -1770,7 +1770,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (goto-char (point-min)) (while (wl-folder-buffer-search-entity name) (wl-folder-update-line value)))))))) - + (defun wl-folder-update-unread (folder unread) ; (save-window-excursion (let ((buf (get-buffer wl-folder-buffer-name)) @@ -2194,7 +2194,7 @@ Use `wl-subscribed-mailing-list'." (wl-summary-get-sync-range (wl-folder-get-elmo-folder fld-name)) nil sticky t))) - + (defun wl-folder-suspend () (interactive) (run-hooks 'wl-folder-suspend-hook) diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el index 3d60312..bbb0e1f 100644 --- a/wl/wl-highlight.el +++ b/wl/wl-highlight.el @@ -1,4 +1,4 @@ -;;; wl-highlight.el -- Hilight modules for Wanderlust. +;;; wl-highlight.el --- Hilight modules for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -886,7 +886,7 @@ (put-text-property bol eol 'face fsymbol) (when dest (put-text-property (next-single-property-change - (next-single-property-change + (next-single-property-change bol 'wl-summary-destination nil eol) 'wl-summary-destination nil eol) diff --git a/wl/wl-message.el b/wl/wl-message.el index 971715f..5976073 100644 --- a/wl/wl-message.el +++ b/wl/wl-message.el @@ -1,4 +1,4 @@ -;;; wl-message.el -- Message displaying modules for Wanderlust. +;;; wl-message.el --- Message displaying modules for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'wl-vars) (require 'wl-highlight) @@ -203,9 +203,9 @@ Return its cache buffer." (if window (select-window window) (when wl-fixed-window-configuration - (delete-other-windows) - (and wl-stay-folder-window - (wl-summary-toggle-disp-folder))) + (delete-other-windows) + (and wl-stay-folder-window + (wl-summary-toggle-disp-folder))) ;; There's no buffer window. Search for message window and snatch it. (if (setq window (wl-message-buffer-window)) (select-window window) @@ -228,7 +228,7 @@ If ARG is specified, narrow to ARGth page." (setq arg (if arg (prefix-numeric-value arg) 0)) (save-excursion (condition-case () - (forward-page -1) ; Beginning of current page. + (forward-page -1) ; Beginning of current page. (beginning-of-buffer (goto-char (point-min)))) (forward-char 1) ; for compatibility with emacs-19.28 and emacs-19.29 @@ -301,7 +301,7 @@ Returns non-nil if bottom of message." ;; XEmacs 21.2.20 and later. (let (window-pixel-scroll-increment) (scroll-up lines)) - (scroll-up lines)) + (scroll-up lines)) (end-of-buffer (goto-char (point-max)))) (setq bottom nil)) @@ -321,7 +321,7 @@ Returns non-nil if bottom of message." (let ((mail-reply-buffer buffer)) (wl-draft-yank-from-mail-reply-buffer nil))) -;; +;; (defun wl-message-mode () "A major mode for message displaying." @@ -354,7 +354,7 @@ Returns non-nil if bottom of message." (wl-message-select-buffer wl-message-buffer)) (wl-summary-goto-folder-subr wl-message-buffer-cur-folder 'no-sync nil nil t) - ; no summary-buf + ; no summary-buf (let ((sum-buf (current-buffer))) (wl-message-select-buffer wl-message-buffer) (setq wl-message-buffer-cur-summary-buffer sum-buf))))) @@ -381,7 +381,7 @@ Returns non-nil if bottom of message." (match-end (nth 1 entry)) (nth 2 entry) (match-string (nth 3 entry)))))))))) - + (defun wl-message-add-buttons-to-header (start end) (save-excursion (save-restriction @@ -507,7 +507,7 @@ Returns non-nil if bottom of message." (let ((elmo-message-fetch-threshold wl-fetch-confirm-threshold) (default-mime-charset wl-mime-charset)) (setq wl-message-buffer-all-header-flag (eq flag 'all-header)) - (prog1 + (prog1 (if (eq flag 'as-is) (let (wl-highlight-x-face-function) (prog1 (elmo-mime-display-as-is folder number diff --git a/wl/wl-mime.el b/wl/wl-mime.el index ff97691..ab69ce2 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -1,4 +1,4 @@ -;;; wl-mime.el -- SEMI implementations of MIME processing on Wanderlust. +;;; wl-mime.el --- SEMI implementations of MIME processing on Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'mime-view) (require 'mime-edit) @@ -140,19 +140,19 @@ By setting following-method as yank-content." (defun wl-message-request-partial (folder number) (elmo-set-work-buf (elmo-message-fetch (wl-folder-get-elmo-folder folder) - number + number (elmo-make-fetch-strategy 'entire) nil (current-buffer) 'unread) (mime-parse-buffer nil))) -(defalias 'wl-message-read 'mime-preview-scroll-up-entity) -(defalias 'wl-message-next-content 'mime-preview-move-to-next) -(defalias 'wl-message-prev-content 'mime-preview-move-to-previous) -(defalias 'wl-message-play-content 'mime-preview-play-current-entity) -(defalias 'wl-message-extract-content 'mime-preview-extract-current-entity) -(defalias 'wl-message-quit 'mime-preview-quit) +(defalias 'wl-message-read 'mime-preview-scroll-up-entity) +(defalias 'wl-message-next-content 'mime-preview-move-to-next) +(defalias 'wl-message-prev-content 'mime-preview-move-to-previous) +(defalias 'wl-message-play-content 'mime-preview-play-current-entity) +(defalias 'wl-message-extract-content 'mime-preview-extract-current-entity) +(defalias 'wl-message-quit 'mime-preview-quit) (defalias 'wl-message-button-dispatcher-internal 'mime-button-dispatcher) diff --git a/wl/wl-mule.el b/wl/wl-mule.el index b934b1a..065060a 100644 --- a/wl/wl-mule.el +++ b/wl/wl-mule.el @@ -1,5 +1,4 @@ -;;; wl-mule.el -- Wanderlust modules for Mule compatible Emacsen. -;; (Mule2.3@19.28, Mule2.3@19.34, Emacs 20.x) +;;; wl-mule.el --- Wanderlust modules for Mule compatible Emacsen. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -25,7 +24,7 @@ ;; ;;; Commentary: -;; +;; For Mule2.3@19.34, Emacs 20.x ;;; Code: ;; diff --git a/wl/wl-refile.el b/wl/wl-refile.el index ef115c0..c8b5f53 100644 --- a/wl/wl-refile.el +++ b/wl/wl-refile.el @@ -1,4 +1,4 @@ -;;; wl-refile.el -- Refile modules for Wanderlust. +;;; wl-refile.el --- Refile modules for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'wl-vars) (require 'wl-util) @@ -117,7 +117,7 @@ (wl-refile-subject-learn entity dst))) (when key (if (setq hit (assoc key wl-refile-alist)) - (setq wl-refile-alist (delq hit wl-refile-alist))) + (setq wl-refile-alist (delq hit wl-refile-alist))) (setq wl-refile-alist (cons (cons key dst) wl-refile-alist))))) @@ -243,7 +243,7 @@ If RULE does not match ENTITY, returns nil." (if (string-match "\\([^@]+\\)@[^@]+" address) (wl-match-string 1 address) address)) - + (defun wl-refile-guess-by-from (entity) (let ((from (downcase (wl-address-header-extract-address @@ -252,7 +252,7 @@ If RULE does not match ENTITY, returns nil." (or (cdr (assoc from wl-refile-alist)) (format "%s/%s" wl-refile-default-from-folder (wl-refile-get-account-part-from-address from))))) - + (defun wl-refile-guess-by-msgid (entity) (cdr (assoc (elmo-msgdb-overview-entity-get-references entity) wl-refile-msgid-alist))) diff --git a/wl/wl-score.el b/wl/wl-score.el index 5974622..e3676e8 100644 --- a/wl/wl-score.el +++ b/wl/wl-score.el @@ -1,4 +1,4 @@ -;;; wl-score.el -- Scoring in Wanderlust. +;;; wl-score.el --- Scoring in Wanderlust. ;; Copyright (C) 1998,1999,2000 Masahiro MURATA ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -28,7 +28,7 @@ ;; Original codes are gnus-score.el and score-mode.el ;;; Code: -;; +;; (require 'wl-vars) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 9c611e2..6ec84a8 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1,4 +1,4 @@ -;;; wl-summary.el -- Summary mode for Wanderlust. +;;; wl-summary.el --- Summary mode for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Masahiro MURATA @@ -757,7 +757,7 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (easy-menu-add wl-summary-mode-menu) (when wl-summary-lazy-highlight (make-local-variable 'window-scroll-functions) - (add-hook 'window-scroll-functions 'wl-highlight-summary-window)) + (add-hook 'window-scroll-functions 'wl-highlight-summary-window)) ;; This hook may contain the function `wl-setup-summary' for reasons ;; of system internal to accord facilities for the Emacs variants. (run-hooks 'wl-summary-mode-hook)) @@ -1660,7 +1660,7 @@ If ARG is non-nil, checking is omitted." (delete-region (match-beginning 2) (match-end 2)) (goto-char (match-beginning 2)) (insert new-mark) - (elmo-file-cache-delete + (elmo-file-cache-delete (elmo-file-cache-get-path (elmo-message-field wl-summary-buffer-elmo-folder number @@ -1697,7 +1697,7 @@ If ARG is non-nil, checking is omitted." (if (elmo-file-cache-exists-p msgid) (if (or (string= mark wl-summary-unread-uncached-mark) ; U -> ! - (string= mark wl-summary-new-mark) ; N -> ! + (string= mark wl-summary-new-mark) ; N -> ! ) (setq set-mark wl-summary-unread-cached-mark) (if (string= mark wl-summary-read-uncached-mark) ; u -> ' ' @@ -1764,7 +1764,7 @@ If ARG 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 + (progn ;;; (goto-char (point-min)) (if (re-search-forward (format "^ *%s \\( \\)" msg-num) nil t) (progn @@ -1951,7 +1951,7 @@ If ARG is non-nil, checking is omitted." wl-summary-unread-uncached-mark wl-summary-new-mark) mark-alist (elmo-msgdb-get-mark-alist (wl-summary-buffer-msgdb)) - num-ma (length mark-alist) + num-ma (length mark-alist) importants (elmo-folder-list-importants wl-summary-buffer-elmo-folder wl-summary-important-mark) @@ -2031,7 +2031,7 @@ If ARG is non-nil, checking is omitted." (buffer-read-only nil) (elmo-folder-update-threshold wl-summary-update-confirm-threshold) gc-message - overview number-alist mark-alist + overview number-alist mark-alist curp num i new-msgdb append-list delete-list crossed update-thread update-top-list @@ -2140,7 +2140,7 @@ If ARG is non-nil, checking is omitted." (if elmo-use-database (elmo-database-close)) (run-hooks 'wl-summary-sync-updated-hook) - (setq mes + (setq mes (if (and (eq (length delete-list) 0) (eq num 0)) (format @@ -2200,7 +2200,7 @@ If ARG is non-nil, checking is omitted." (wl-delete-all-overlays) (set-buffer-modified-p nil) (if mes (message "%s" mes))))) - + (defun wl-summary-set-score-mark (mark) (save-excursion (beginning-of-line) @@ -2593,7 +2593,7 @@ If ARG, without confirm." (set-buffer-modified-p nil) (goto-char (point-min)) (if (wl-summary-cursor-down t) - (let ((unreadp (wl-summary-next-message + (let ((unreadp (wl-summary-next-message (wl-summary-message-number) 'down t))) (cond ((and wl-auto-select-first @@ -2794,7 +2794,7 @@ If ARG, without confirm." ;; Is founded entity myself or children? (not (string= (elmo-msgdb-overview-entity-get-id entity) - (elmo-msgdb-overview-entity-get-id + (elmo-msgdb-overview-entity-get-id (car found-entity)))) (with-current-buffer summary-buf (not (wl-thread-descendant-p diff --git a/wl/wl-template.el b/wl/wl-template.el index 0129e5a..ddbf66a 100644 --- a/wl/wl-template.el +++ b/wl/wl-template.el @@ -1,4 +1,4 @@ -;;; wl-template.el -- Draft template feature for Wanderlust. +;;; wl-template.el --- Draft template feature for Wanderlust. ;; Copyright (C) 1998,1999,2000 Masahiro MURATA ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -27,7 +27,7 @@ ;;; Commentary: ;;; Code: -;; +;; ;; Variables @@ -77,7 +77,7 @@ See info under Wanderlust for full documentation. \\{wl-template-mode} -Enterring WL-Template mode calls the value of `wl-template-mode-hook'." +Entering WL-Template mode calls the value of `wl-template-mode-hook'." (kill-all-local-variables) (setq mode-name "Wl-Template" major-mode 'wl-template-mode) diff --git a/wl/wl-thread.el b/wl/wl-thread.el index eb52fd9..26f4eab 100644 --- a/wl/wl-thread.el +++ b/wl/wl-thread.el @@ -1,4 +1,4 @@ -;;; wl-thread.el -- Thread display modules for Wanderlust. +;;; wl-thread.el --- Thread display modules for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Masahiro MURATA @@ -26,10 +26,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'wl-summary) (require 'wl-highlight) @@ -37,10 +37,10 @@ ;; buffer local variables. ;;(defvar wl-thread-top-entity '(nil t nil nil)) ; top entity -(defvar wl-thread-tops nil) ; top number list (number) +(defvar wl-thread-tops nil) ; top number list (number) (defvar wl-thread-entities nil) -(defvar wl-thread-entity-list nil) ; entity list -(defvar wl-thread-entity-hashtb nil) ; obarray +(defvar wl-thread-entity-list nil) ; entity list +(defvar wl-thread-entity-hashtb nil) ; obarray (defvar wl-thread-indent-regexp nil) (make-variable-buffer-local 'wl-thread-entity-hashtb) @@ -201,10 +201,10 @@ (elmo-list-insert wl-summary-buffer-number-list (wl-thread-entity-get-number entity) (progn - (while (setq curc + (while (setq curc (wl-thread-entity-get-children curp)) - (setq curp (wl-thread-get-entity - (nth (- (length curc) 1) + (setq curp (wl-thread-get-entity + (nth (- (length curc) 1) curc)))) (wl-thread-entity-get-number curp))) (setcar (cddr to) (wl-append children @@ -310,8 +310,8 @@ ENTITY is returned." (defun wl-thread-jump-to-msg (&optional number) (interactive) (let ((num (or number - (string-to-int - (read-from-minibuffer "Jump to Message(No.): "))))) + (string-to-int + (read-from-minibuffer "Jump to Message(No.): "))))) (wl-thread-entity-force-open (wl-thread-get-entity num)) (wl-summary-jump-to-msg num))) @@ -652,10 +652,10 @@ ENTITY is returned." ent entity nil)) (setq insert-msgs (cdr insert-msgs)))))) (if update - ;; modify buffer. + ;; modify buffer. (while update-msgs (wl-thread-update-line-on-buffer-sub nil (pop update-msgs))) - ;; don't update buffer + ;; don't update buffer update-msgs)))) ; return value (defun wl-thread-insert-message (overview-entity overview mark-alist @@ -771,7 +771,7 @@ Message is inserted to the summary buffer." (ding) (message "Error in wl-thread-update-children-number-hook.")))))))) -;; +;; ;; Thread oriented commands. ;; (defun wl-thread-call-region-func (func &optional arg) @@ -829,7 +829,7 @@ Message is inserted to the summary buffer." (error (elmo-display-error err t) nil))) - + (defun wl-thread-delete (&optional arg) (interactive "P") (wl-thread-call-region-func 'wl-summary-delete-region arg) @@ -1142,7 +1142,7 @@ Message is inserted to the summary buffer." (wl-thread-get-entity (wl-summary-message-number))))))) (wl-summary-set-message-modified) (set-buffer-modified-p nil)))) - + (defun wl-thread-get-depth-of-current-line () (interactive) diff --git a/wl/wl-util.el b/wl/wl-util.el index c05529c..d591fd6 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -1,4 +1,4 @@ -;;; wl-util.el -- Utility modules for Wanderlust. +;;; wl-util.el --- Utility modules for Wanderlust. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 2000 A. SAGATA @@ -513,14 +513,14 @@ that `read' can handle, whenever this is possible." "^nntp://\\([^:/]*\\):?\\([0-9]*\\)/\\([^/]*\\)/\\([0-9]*\\).*$" url) (progn (if (eq (length (setq fld-name - (elmo-match-string 3 url))) 0) - (setq fld-name nil)) + (elmo-match-string 3 url))) 0) + (setq fld-name nil)) (if (eq (length (setq port (elmo-match-string 2 url))) 0) - (setq port (int-to-string elmo-nntp-default-port))) + (setq port (int-to-string elmo-nntp-default-port))) (if (eq (length (setq server - (elmo-match-string 1 url))) 0) - (setq server elmo-nntp-default-server)) + (elmo-match-string 1 url))) 0) + (setq server elmo-nntp-default-server)) (setq folder (concat "-" fld-name "@" server ":" port)) (if (eq (length (setq msg (elmo-match-string 4 url))) 0) @@ -539,7 +539,7 @@ that `read' can handle, whenever this is possible." (defmacro wl-current-message-buffer () (` (save-excursion (if (buffer-live-p wl-current-summary-buffer) - (set-buffer wl-current-summary-buffer)) + (set-buffer wl-current-summary-buffer)) wl-message-buffer))) (defmacro wl-kill-buffers (regexp) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index 7d7b337..9a153ae 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -1,4 +1,4 @@ -;;; wl-vars.el -- Variable definitions for Wanderlust. +;;; wl-vars.el --- Variable definitions for Wanderlust. ;; Copyright (C) 1998,1999,2000,2001 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000,2001 Masahiro MURATA diff --git a/wl/wl-version.el b/wl/wl-version.el index 4b1913a..28b30b1 100644 --- a/wl/wl-version.el +++ b/wl/wl-version.el @@ -1,4 +1,4 @@ -;;; wl-version.el -- Version information for Wanderlust. +;;; wl-version.el --- Version information for Wanderlust. ;; Copyright (C) 2000-2001 Yuuichi Teranishi ;; Copyright (C) 2000-2001 TAKAHASHI Kaoru diff --git a/wl/wl-xmas.el b/wl/wl-xmas.el index e31bff5..86578ea 100644 --- a/wl/wl-xmas.el +++ b/wl/wl-xmas.el @@ -1,4 +1,4 @@ -;;; wl-xmas.el -- Wanderlust modules for XEmacsen. +;;; wl-xmas.el --- Wanderlust modules for XEmacsen. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 2000 Katsumi Yamaoka @@ -362,23 +362,23 @@ (defvar wl-folder-internal-icon-list ;; alist of (glyph . icon-file) - '((wl-folder-nntp-glyph . wl-nntp-folder-icon) - (wl-folder-imap4-glyph . wl-imap-folder-icon) - (wl-folder-pop3-glyph . wl-pop-folder-icon) - (wl-folder-localdir-glyph . wl-localdir-folder-icon) - (wl-folder-localnews-glyph . wl-localnews-folder-icon) - (wl-folder-internal-glyph . wl-internal-folder-icon) - (wl-folder-multi-glyph . wl-multi-folder-icon) - (wl-folder-filter-glyph . wl-filter-folder-icon) - (wl-folder-archive-glyph . wl-archive-folder-icon) - (wl-folder-pipe-glyph . wl-pipe-folder-icon) - (wl-folder-maildir-glyph . wl-maildir-folder-icon) - (wl-folder-nmz-glyph . wl-nmz-folder-icon) - (wl-folder-shimbun-glyph . wl-shimbun-folder-icon) - (wl-folder-trash-empty-glyph . wl-empty-trash-folder-icon) - (wl-folder-draft-glyph . wl-draft-folder-icon) - (wl-folder-queue-glyph . wl-queue-folder-icon) - (wl-folder-trash-glyph . wl-trash-folder-icon))) + '((wl-folder-nntp-glyph . wl-nntp-folder-icon) + (wl-folder-imap4-glyph . wl-imap-folder-icon) + (wl-folder-pop3-glyph . wl-pop-folder-icon) + (wl-folder-localdir-glyph . wl-localdir-folder-icon) + (wl-folder-localnews-glyph . wl-localnews-folder-icon) + (wl-folder-internal-glyph . wl-internal-folder-icon) + (wl-folder-multi-glyph . wl-multi-folder-icon) + (wl-folder-filter-glyph . wl-filter-folder-icon) + (wl-folder-archive-glyph . wl-archive-folder-icon) + (wl-folder-pipe-glyph . wl-pipe-folder-icon) + (wl-folder-maildir-glyph . wl-maildir-folder-icon) + (wl-folder-nmz-glyph . wl-nmz-folder-icon) + (wl-folder-shimbun-glyph . wl-shimbun-folder-icon) + (wl-folder-trash-empty-glyph . wl-empty-trash-folder-icon) + (wl-folder-draft-glyph . wl-draft-folder-icon) + (wl-folder-queue-glyph . wl-queue-folder-icon) + (wl-folder-trash-glyph . wl-trash-folder-icon))) (defun wl-folder-init-icons () (dolist (icon wl-folder-internal-icon-list) diff --git a/wl/wl.el b/wl/wl.el index 46dc6f2..f63f4ff 100644 --- a/wl/wl.el +++ b/wl/wl.el @@ -1,4 +1,4 @@ -;;; wl.el -- Wanderlust bootstrap. +;;; wl.el --- Wanderlust bootstrap. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Masahiro MURATA @@ -37,7 +37,7 @@ ;; from x-face.el (unless (and (fboundp 'defgroup) - (fboundp 'defcustom)) + (fboundp 'defcustom)) (require 'backquote) (defmacro defgroup (&rest args)) (defmacro defcustom (symbol value &optional doc &rest args) @@ -481,7 +481,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (save-excursion (beginning-of-line) (cond - ;; swtich variable + ;; switch variable ((bobp) (let (variable switch name) (goto-char cur-point) @@ -500,7 +500,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (delete-region (match-beginning 2) (match-end 2)) (insert (wl-plugged-string switch)) (set-buffer-modified-p nil))))) - ;; swtich plug + ;; switch plug ((looking-at "^\\( *\\)\\[\\([^]]+\\)\\]\\([^ \n]*\\)") (let* ((indent (length (elmo-match-buffer 1))) (switch (elmo-match-buffer 2)) @@ -642,7 +642,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'." (defun wl-exit () (interactive) (when (or (not wl-interactive-exit) - (y-or-n-p "Quit Wanderlust? ")) + (y-or-n-p "Do you really want to quit Wanderlust? ")) (elmo-quit) (wl-biff-stop) (run-hooks 'wl-exit-hook) @@ -776,7 +776,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped." (wl-folder-auto-check) (run-hooks 'wl-auto-check-folder-hook)) (unless arg (wl-biff-start))) - (error + (error (if (buffer-live-p demo-buf) (kill-buffer demo-buf)) (signal (car obj)(cdr obj))) -- 1.7.10.4