From: kaoru Date: Fri, 23 Nov 2001 09:35:30 +0000 (+0000) Subject: Fixed conventional headers. Use --- Instead of -- in the first line. X-Git-Tag: wl-2_8-root~119 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=51f9787799e1f8a5ad1f9cde0fd99489dae071c3;p=elisp%2Fwanderlust.git Fixed conventional headers. Use --- Instead of -- in the first line. Tabify and remove verbose spaces. --- diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el index 767ebb7..95efaba 100644 --- a/elmo/elmo-archive.el +++ b/elmo/elmo-archive.el @@ -1,4 +1,4 @@ -;;; elmo-archive.el -- Archive folder of ELMO. +;;; elmo-archive.el --- Archive folder of ELMO. ;; Copyright (C) 1998,1999,2000 OKUNISHI Fujikazu ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi diff --git a/elmo/elmo-cache.el b/elmo/elmo-cache.el index 980a650..5587e32 100644 --- a/elmo/elmo-cache.el +++ b/elmo/elmo-cache.el @@ -1,4 +1,4 @@ -;;; elmo-cache.el -- Cache modules for Elmo. +;;; elmo-cache.el --- Cache modules for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 2000 Kenichi OKADA @@ -26,17 +26,17 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo-vars) (require 'elmo-util) (require 'elmo) (require 'elmo-map) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; +;; ;; cache backend by Kenichi OKADA ;; (eval-and-compile diff --git a/elmo/elmo-database.el b/elmo/elmo-database.el index 7f107e9..defccca 100644 --- a/elmo/elmo-database.el +++ b/elmo/elmo-database.el @@ -1,4 +1,4 @@ -;;; elmo-database.el -- Database module for ELMO. +;;; elmo-database.el --- Database module for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo-vars) (require 'elmo-msgdb) diff --git a/elmo/elmo-date.el b/elmo/elmo-date.el index 75fbb5c..47d10c9 100644 --- a/elmo/elmo-date.el +++ b/elmo/elmo-date.el @@ -1,4 +1,4 @@ -;;; elmo-date.el -- Date processing module for ELMO. +;;; elmo-date.el --- Date processing module for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'path-util) diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el index abf1bce..f18b043 100644 --- a/elmo/elmo-dop.el +++ b/elmo/elmo-dop.el @@ -1,4 +1,4 @@ -;;; elmo-dop.el -- Modules for Disconnected Operations on ELMO. +;;; elmo-dop.el --- Modules for Disconnected Operations on ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo) (require 'elmo-vars) @@ -114,7 +114,7 @@ even an operation concerns the unplugged folder." (progn (apply (elmo-dop-queue-method (car queue)) (prog1 - (setq folder + (setq folder (elmo-make-folder (elmo-dop-queue-fname (car queue)))) (elmo-folder-open folder)) @@ -129,7 +129,7 @@ even an operation concerns the unplugged folder." (setq queue (cdr queue))) (message "%d/%d operation(s) are performed successfully." performed num) - (sit-for 0) ; + (sit-for 0) ; (elmo-dop-queue-save))) (if (elmo-y-or-n-p "Clear all pending operations? " (not elmo-dop-flush-confirm) t) @@ -168,7 +168,7 @@ Return a message number." (elmo-localdir-folder-directory-internal folder)) nil 'no-msg) new-number)) - + (defun elmo-dop-spool-folder-list-messages (folder) "List messages in the dop spool folder. @@ -252,7 +252,7 @@ FOLDER is the folder structure." (elmo-message-fetch spool-folder number (elmo-make-fetch-strategy 'entire) nil (current-buffer) 'unread) - (condition-case nil + (condition-case nil (setq failure (not (elmo-folder-append-buffer folder unread set-number))) (error (setq failure t))) @@ -271,7 +271,7 @@ FOLDER is the folder structure." folder ;; messages are deleted only if message-id is not changed. (mapcar 'car - (elmo-delete-if + (elmo-delete-if (lambda (pair) (not (string= (cdr pair) diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el index e9d6b74..e98d034 100644 --- a/elmo/elmo-filter.el +++ b/elmo/elmo-filter.el @@ -1,4 +1,4 @@ -;;; elmo-filter.el -- Filtered Folder Interface for ELMO. +;;; elmo-filter.el --- Filtered Folder Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo) ;;; ELMO filter folder @@ -43,7 +43,7 @@ (elmo-filter-folder-set-condition-internal folder (car pair)) (if (string-match "^ */\\(.*\\)$" (cdr pair)) - (elmo-filter-folder-set-target-internal + (elmo-filter-folder-set-target-internal folder (elmo-make-folder (elmo-match-string 1 (cdr pair)))) (error "Folder syntax error `%s'" (elmo-folder-name-internal folder))) diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index ca327a7..9e12c2f 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -1,4 +1,4 @@ -;;; elmo-imap4.el -- IMAP4 Interface for ELMO. +;;; elmo-imap4.el --- IMAP4 Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1999,2000 Kenichi OKADA @@ -1735,9 +1735,9 @@ Return nil if no complete line has arrived." (luna-define-method elmo-folder-initialize :around ((folder elmo-imap4-folder) name) - (let ((default-user elmo-imap4-default-user) - (default-server elmo-imap4-default-server) - (default-port elmo-imap4-default-port) + (let ((default-user elmo-imap4-default-user) + (default-server elmo-imap4-default-server) + (default-port elmo-imap4-default-port) (elmo-network-stream-type-alist (if elmo-imap4-stream-type-alist (append elmo-imap4-stream-type-alist @@ -1779,7 +1779,7 @@ Return nil if no complete line has arrived." folder (elmo-get-network-stream-type elmo-imap4-default-stream-type))) folder)) - + ;;; ELMO IMAP4 folder (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-imap4-folder)) diff --git a/elmo/elmo-internal.el b/elmo/elmo-internal.el index 75415fb..54e6c22 100644 --- a/elmo/elmo-internal.el +++ b/elmo/elmo-internal.el @@ -1,4 +1,4 @@ -;;; elmo-internal.el -- Internal Interface for ELMO. +;;; elmo-internal.el --- Internal Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo) ;;; ELMO internal folder diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el index 7d7a917..0fb039e 100644 --- a/elmo/elmo-localdir.el +++ b/elmo/elmo-localdir.el @@ -1,4 +1,4 @@ -;;; elmo-localdir.el -- Localdir Interface for ELMO. +;;; elmo-localdir.el --- Localdir Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Masahiro MURATA diff --git a/elmo/elmo-localnews.el b/elmo/elmo-localnews.el index e66714e..8468818 100644 --- a/elmo/elmo-localnews.el +++ b/elmo/elmo-localnews.el @@ -1,4 +1,4 @@ -;;; elmo-localnews.el -- Local News Spool Interface for ELMO. +;;; elmo-localnews.el --- Local News Spool Interface for ELMO. ;; Copyright (C) 1998,1999,2000 OKUNISHI Fujikazu ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -26,10 +26,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo-localdir) (eval-and-compile diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el index 1435526..c53ee3a 100644 --- a/elmo/elmo-maildir.el +++ b/elmo/elmo-maildir.el @@ -1,4 +1,4 @@ -;;; elmo-maildir.el -- Maildir interface for ELMO. +;;; elmo-maildir.el --- Maildir interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (eval-when-compile (require 'cl)) diff --git a/elmo/elmo-map.el b/elmo/elmo-map.el index 9fa616a..8b0656d 100644 --- a/elmo/elmo-map.el +++ b/elmo/elmo-map.el @@ -1,4 +1,4 @@ -;;; elmo-map.el -- A ELMO folder class with message number mapping. +;;; elmo-map.el --- A ELMO folder class with message number mapping. ;; Copyright (C) 2000 Yuuichi Teranishi @@ -28,7 +28,7 @@ ;; should inherit this folder. ;;; Code: -;; +;; (require 'elmo) (require 'elmo-msgdb) diff --git a/elmo/elmo-mark.el b/elmo/elmo-mark.el index cfa33ff..5f5b0f9 100644 --- a/elmo/elmo-mark.el +++ b/elmo/elmo-mark.el @@ -1,4 +1,4 @@ -;;; elmo-mark.el -- Global mark folder for ELMO. +;;; elmo-mark.el --- Global mark folder for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo) (require 'elmo-map) diff --git a/elmo/elmo-mime.el b/elmo/elmo-mime.el index 498944c..46a4881 100644 --- a/elmo/elmo-mime.el +++ b/elmo/elmo-mime.el @@ -1,4 +1,4 @@ -;;; elmo-mime.el -- MIME module for ELMO. +;;; elmo-mime.el --- MIME module for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -327,4 +327,4 @@ Return non-nil if cache is used." (require 'product) (product-provide (provide 'elmo-mime) (require 'elmo-version)) -;; elmo-mime.el ends here \ No newline at end of file +;; elmo-mime.el ends here diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el index 9c4217d..b20646d 100644 --- a/elmo/elmo-msgdb.el +++ b/elmo/elmo-msgdb.el @@ -1,4 +1,4 @@ -;;; elmo-msgdb.el -- Message Database for Elmo. +;;; elmo-msgdb.el --- Message Database for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 2000 Masahiro MURATA diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el index b155020..6ab6ef3 100644 --- a/elmo/elmo-multi.el +++ b/elmo/elmo-multi.el @@ -1,4 +1,4 @@ -;;; elmo-multi.el -- Multiple Folder Interface for ELMO. +;;; elmo-multi.el --- Multiple Folder Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo) (require 'luna) @@ -73,7 +73,7 @@ (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-multi-folder)) - (expand-file-name (elmo-replace-string-as-filename + (expand-file-name (elmo-replace-string-as-filename (elmo-folder-name-internal folder)) (expand-file-name "multi" elmo-msgdb-dir))) @@ -84,13 +84,13 @@ (mapcar 'elmo-folder-newsgroups (elmo-flatten - (mapcar + (mapcar 'elmo-folder-get-primitive-list (elmo-multi-folder-children-internal folder))))))) (luna-define-method elmo-folder-get-primitive-list ((folder elmo-multi-folder)) (elmo-flatten - (mapcar + (mapcar 'elmo-folder-get-primitive-list (elmo-multi-folder-children-internal folder)))) @@ -106,7 +106,7 @@ (luna-define-method elmo-message-use-cache-p ((folder elmo-multi-folder) number) - (elmo-message-use-cache-p + (elmo-message-use-cache-p (nth (- (/ number (elmo-multi-folder-divide-number-internal folder)) 1) (elmo-multi-folder-children-internal folder)) (% number (elmo-multi-folder-divide-number-internal folder)))) @@ -215,7 +215,7 @@ (if (setq same (rassoc (cdr (car cur)) all-alist)) (unless (= (/ (car (car cur)) (elmo-multi-folder-divide-number-internal folder)) - (/ (car same) + (/ (car same) (elmo-multi-folder-divide-number-internal folder))) ;; base is also same...delete it! (setq to-be-deleted @@ -612,7 +612,7 @@ (elmo-folder-mark-as-important (car folder-numbers) (cdr folder-numbers))) t) - + (luna-define-method elmo-folder-unmark-important ((folder elmo-multi-folder) numbers) (dolist (folder-numbers (elmo-multi-make-folder-numbers-list folder numbers)) diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el index 2eb2f21..afd2fa8 100644 --- a/elmo/elmo-net.el +++ b/elmo/elmo-net.el @@ -1,4 +1,4 @@ -;;; elmo-net.el -- Network module for ELMO. +;;; elmo-net.el --- Network module for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,7 +24,7 @@ ;; ;;; Commentary: -;; +;; (eval-when-compile (require 'cl)) @@ -248,7 +248,7 @@ Returns a process object. if making session failed, returns nil." (elmo-network-stream-type-feature stream-type)) (require (elmo-network-stream-type-feature stream-type))) (condition-case err - (let (process-connection-type) + (let (process-connection-type) (as-binary-process (setq process (if stream-type @@ -296,7 +296,7 @@ Returned value is searched from `elmo-network-stream-type-alist'." folder (string-to-int (elmo-match-substring 2 name 1)))) (if (match-beginning 3) - (elmo-net-folder-set-stream-type-internal + (elmo-net-folder-set-stream-type-internal folder (assoc (elmo-match-string 3 name) elmo-network-stream-type-alist))) @@ -321,7 +321,7 @@ Returned value is searched from `elmo-network-stream-type-alist'." (apply 'elmo-plugged-p (append (elmo-net-port-info folder) (list nil (quote (elmo-net-port-label folder)))))) - + (luna-define-method elmo-folder-set-plugged ((folder elmo-net-folder) plugged &optional add) (apply 'elmo-set-plugged plugged @@ -423,12 +423,12 @@ Returned value is searched from `elmo-network-stream-type-alist'." new-mark already-mark seen-mark important-mark seen-list))) -(luna-define-method elmo-folder-msgdb-create-unplugged ((folder +(luna-define-method elmo-folder-msgdb-create-unplugged ((folder elmo-net-folder) numbers new-mark already-mark seen-mark - important-mark + important-mark seen-list) ;; XXXX should be appended to already existing msgdb. (elmo-dop-msgdb @@ -436,7 +436,7 @@ Returned value is searched from `elmo-network-stream-type-alist'." (mapcar 'abs numbers) new-mark already-mark seen-mark - important-mark + important-mark seen-list))) (luna-define-method elmo-folder-unmark-important ((folder elmo-net-folder) @@ -477,7 +477,7 @@ Returned value is searched from `elmo-network-stream-type-alist'." t)) (luna-define-method elmo-folder-mark-as-read-unplugged ((folder - elmo-net-folder) + elmo-net-folder) numbers) (elmo-folder-mark-as-read-dop folder numbers)) @@ -486,7 +486,7 @@ Returned value is searched from `elmo-network-stream-type-alist'." (elmo-folder-unmark-read-dop folder numbers)) (luna-define-method elmo-folder-mark-as-important-unplugged ((folder - elmo-net-folder) + elmo-net-folder) numbers) (elmo-folder-mark-as-important-dop folder numbers)) diff --git a/elmo/elmo-nmz.el b/elmo/elmo-nmz.el index d0c414d..1b210ff 100644 --- a/elmo/elmo-nmz.el +++ b/elmo/elmo-nmz.el @@ -1,4 +1,4 @@ -;;; elmo-nmz.el -- Namazu interface for ELMO. +;;; elmo-nmz.el --- Namazu interface for ELMO. ;; Copyright (C) 2000 Yuuichi Teranishi @@ -248,13 +248,13 @@ (elmo-map-message-location folder (car msgs)) condition (car msgs) - orig) - (setq matches (cons (car msgs) matches))) + orig) + (setq matches (cons (car msgs) matches))) (setq i (1+ i)) (setq percent (/ (* i 100) num)) (elmo-display-progress - 'elmo-nmz-search "Searching..." - percent) + 'elmo-nmz-search "Searching..." + percent) (setq msgs (cdr msgs))) matches)) @@ -276,8 +276,8 @@ (luna-define-method elmo-folder-mark-as-read ((folder elmo-nmz-folder) numbers) t) - + (require 'product) (product-provide (provide 'elmo-nmz) (require 'elmo-version)) -;;; elmo-nmz.el ends here \ No newline at end of file +;;; elmo-nmz.el ends here diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el index 327bdd2..b210779 100644 --- a/elmo/elmo-nntp.el +++ b/elmo/elmo-nntp.el @@ -1,4 +1,4 @@ -;;; elmo-nntp.el -- NNTP Interface for ELMO. +;;; elmo-nntp.el --- NNTP Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1998,1999,2000 Masahiro MURATA @@ -28,10 +28,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo-vars) (require 'elmo-util) @@ -91,7 +91,7 @@ elmo-nntp-default-user (car parse))) (unless (elmo-net-folder-server-internal folder) - (elmo-net-folder-set-server-internal folder + (elmo-net-folder-set-server-internal folder elmo-nntp-default-server)) (unless (elmo-net-folder-port-internal folder) (elmo-net-folder-set-port-internal folder @@ -258,10 +258,10 @@ Don't cache if nil.") (setq elmo-nntp-read-point (point-min)) ;; Skip garbage output from process before greeting. (while (and (memq (process-status process) '(open run)) - (goto-char (point-max)) - (forward-line -1) - (not (looking-at "20[01]"))) - (accept-process-output process 1)) + (goto-char (point-max)) + (forward-line -1) + (not (looking-at "20[01]"))) + (accept-process-output process 1)) (setq elmo-nntp-read-point (point)) (or (elmo-nntp-read-response session t) (error "Cannot open network")) @@ -306,7 +306,7 @@ Don't cache if nil.") (elmo-nntp-send-command session "mode reader") (if (null (elmo-nntp-read-response session t)) (error "Mode reader failed"))) - + (defun elmo-nntp-send-command (session command &optional noerase) (with-current-buffer (elmo-network-session-buffer session) (unless noerase @@ -446,7 +446,7 @@ Don't cache if nil.") (with-temp-buffer (set-buffer-multibyte nil) (if (and (elmo-nntp-folder-group-internal folder) - (elmo-nntp-select-group + (elmo-nntp-select-group session (elmo-nntp-folder-group-internal folder))) ;; add top newsgroups @@ -489,7 +489,7 @@ Don't cache if nil.") (setq start nil) (while (string-match (concat "^" (regexp-quote - (or + (or (elmo-nntp-folder-group-internal folder) "")) ".*$") @@ -503,7 +503,7 @@ Don't cache if nil.") (progn (setq regexp (format "^\\(%s[^. ]+\\)\\([. ]\\).*\n" - (if (and + (if (and (elmo-nntp-folder-group-internal folder) (null (string= (elmo-nntp-folder-group-internal @@ -643,7 +643,7 @@ Don't cache if nil.") ;; Max is killed. (setq end-num nil)) (cons end-num (car entry))) - (error "No such newsgroup \"%s\"" + (error "No such newsgroup \"%s\"" (elmo-nntp-folder-group-internal folder))) (let ((session (elmo-nntp-get-session folder)) response e-num) @@ -651,7 +651,7 @@ Don't cache if nil.") (error "Connection failed")) (save-excursion (elmo-nntp-send-command session - (format + (format "group %s" (elmo-nntp-folder-group-internal folder))) (setq response (elmo-nntp-read-response session)) @@ -1167,7 +1167,7 @@ Returns a list of cons cells like (NUMBER . VALUE)" (elmo-list-filter from-msgs result) result)))))) -(luna-define-method elmo-folder-search ((folder elmo-nntp-folder) +(luna-define-method elmo-folder-search ((folder elmo-nntp-folder) condition &optional from-msgs) (let (result) (cond @@ -1482,7 +1482,7 @@ Returns a list of cons cells like (NUMBER . VALUE)" message-id (std11-msg-id-string (car (std11-parse-msg-id-string (std11-fetch-field "message-id")))))) - (when newsgroups + (when newsgroups (when (setq crosspost-newsgroups (delete (elmo-nntp-folder-group-internal folder) @@ -1547,18 +1547,18 @@ Returns a list of cons cells like (NUMBER . VALUE)" (setq elmo-crosspost-message-alist-modified t))) (dolist (dele cross-deletes) (setq elmo-crosspost-message-alist (delq - dele + dele elmo-crosspost-message-alist))) (elmo-nntp-folder-set-reads-internal folder reads))) -(luna-define-method elmo-folder-list-unreads-internal +(luna-define-method elmo-folder-list-unreads-internal ((folder elmo-nntp-folder) unread-marks mark-alist) ;; 2.3. elmo-folder-list-unreads return unread message list according to ;; `reads' slot. (let ((mark-alist (or mark-alist (elmo-msgdb-get-mark-alist (elmo-folder-msgdb folder))))) (elmo-living-messages (delq nil - (mapcar + (mapcar (lambda (x) (if (member (nth 1 x) unread-marks) (car x))) diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index 2ed6ddf..23209e5 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -1,4 +1,4 @@ -;;; elmo-pipe.el -- PIPE Interface for ELMO. +;;; elmo-pipe.el --- PIPE Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el index f6a1e91..6dfb0d7 100644 --- a/elmo/elmo-pop3.el +++ b/elmo/elmo-pop3.el @@ -1,4 +1,4 @@ -;;; elmo-pop3.el -- POP3 Interface for ELMO. +;;; elmo-pop3.el --- POP3 Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi ;; Copyright (C) 1999,2000 Kenichi OKADA @@ -26,10 +26,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'elmo-msgdb) (require 'elmo-net) @@ -112,7 +112,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") elmo-pop3-default-use-uidl (string= (car parse) "uidl"))) (unless (elmo-net-folder-server-internal folder) - (elmo-net-folder-set-server-internal folder + (elmo-net-folder-set-server-internal folder elmo-pop3-default-server)) (unless (elmo-net-folder-port-internal folder) (elmo-net-folder-set-port-internal folder @@ -149,7 +149,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (when (memq (process-status (elmo-network-session-process-internal session)) '(open run)) - (let ((buffer (process-buffer + (let ((buffer (process-buffer (elmo-network-session-process-internal session)))) (elmo-pop3-send-command (elmo-network-session-process-internal session) "quit") @@ -211,7 +211,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (setq return-value nil)) (setq elmo-pop3-read-point match-end) (if not-command - (setq response-continue nil)) + (setq response-continue nil)) (setq return-value (if return-value (concat return-value "\n" response-string) @@ -226,7 +226,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (insert output) (elmo-pop3-debug "RECEIVED: %s\n" output) (if (and elmo-pop3-total-size - (> elmo-pop3-total-size + (> elmo-pop3-total-size (min elmo-display-retrieval-progress-threshold 100))) (elmo-display-progress 'elmo-display-retrieval-progress @@ -274,7 +274,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (signal 'elmo-authenticate-error '(elmo-pop3-auth-apop)))) (signal 'elmo-open-error '(elmo-pop3-auth-apop)))) - + (luna-define-method elmo-network-initialize-session-buffer :after ((session elmo-pop3-session) buffer) (with-current-buffer buffer @@ -311,7 +311,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (luna-define-method elmo-network-authenticate-session ((session elmo-pop3-session)) - (with-current-buffer (process-buffer + (with-current-buffer (process-buffer (elmo-network-session-process-internal session)) (let* ((process (elmo-network-session-process-internal session)) (elmo-pop3-debug-inhibit-logging t) @@ -375,7 +375,7 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (throw 'done nil))) (sasl-step-set-data step - (elmo-base64-decode-string + (elmo-base64-decode-string (cadr (split-string response " ")))) (setq step (sasl-next-step client step)) (elmo-pop3-send-command @@ -599,11 +599,11 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"") (cond ((eq (following-char) ?+) (if (re-search-forward "\n\\.\r?\n" nil t) - t + t nil)) ((looking-at "-") (if (search-forward "\n" nil t) - t + t nil)) (t nil))) diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el index 4011a31..f109727 100644 --- a/elmo/elmo-shimbun.el +++ b/elmo/elmo-shimbun.el @@ -1,4 +1,4 @@ -;;; elmo-shimbun.el -- Shimbun interface for ELMO. +;;; elmo-shimbun.el --- Shimbun interface for ELMO. ;; Copyright (C) 2001 Yuuichi Teranishi @@ -503,4 +503,4 @@ update overview when message is fetched." (require 'product) (product-provide (provide 'elmo-shimbun) (require 'elmo-version)) -;;; elmo-shimbun.el ends here \ No newline at end of file +;;; elmo-shimbun.el ends here diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el index c829cde..3acfea3 100644 --- a/elmo/elmo-util.el +++ b/elmo/elmo-util.el @@ -1,4 +1,4 @@ -;;; elmo-util.el -- Utilities for Elmo. +;;; elmo-util.el --- Utilities for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (eval-when-compile (require 'cl)) (require 'elmo-vars) @@ -42,13 +42,13 @@ (defmacro elmo-set-buffer-multibyte (flag) "Set the multibyte flag of the current buffer to FLAG." (cond ((boundp 'MULE) - (list 'setq 'mc-flag flag)) - ((featurep 'xemacs) - flag) - ((and (boundp 'emacs-major-version) (>= emacs-major-version 20)) - (list 'set-buffer-multibyte flag)) - (t - flag))) + (list 'setq 'mc-flag flag)) + ((featurep 'xemacs) + flag) + ((and (boundp 'emacs-major-version) (>= emacs-major-version 20)) + (list 'set-buffer-multibyte flag)) + (t + flag))) (defvar elmo-work-buf-name " *elmo work*") (defvar elmo-temp-buf-name " *elmo temp*") @@ -206,7 +206,7 @@ Return value is a cons cell of (STRUCTURE . REST)" (elmo-condition-parse-error))) ;; or-expr ::= and-expr / -;; and-expr "|" or-expr +;; and-expr "|" or-expr (defun elmo-condition-parse-or-expr () (let ((left (elmo-condition-parse-and-expr))) (if (looking-at "| *") @@ -396,19 +396,19 @@ Return value is a cons cell of (STRUCTURE . REST)" (defun elmo-passwd-alist-load () (save-excursion (let ((filename (expand-file-name elmo-passwd-alist-file-name - elmo-msgdb-dir)) - (tmp-buffer (get-buffer-create " *elmo-passwd-alist-tmp*")) - insert-file-contents-pre-hook ; To avoid autoconv-xmas... - insert-file-contents-post-hook - ret-val) + elmo-msgdb-dir)) + (tmp-buffer (get-buffer-create " *elmo-passwd-alist-tmp*")) + insert-file-contents-pre-hook ; To avoid autoconv-xmas... + insert-file-contents-post-hook + ret-val) (if (not (file-readable-p filename)) - () - (set-buffer tmp-buffer) - (insert-file-contents filename) - (setq ret-val - (condition-case nil - (read (current-buffer)) - (error nil nil)))) + () + (set-buffer tmp-buffer) + (insert-file-contents filename) + (setq ret-val + (condition-case nil + (read (current-buffer)) + (error nil nil)))) (kill-buffer tmp-buffer) ret-val))) @@ -416,14 +416,14 @@ Return value is a cons cell of (STRUCTURE . REST)" "Clear password cache." (interactive) (setq elmo-passwd-alist nil)) - + (defun elmo-passwd-alist-save () "Save password into file." (interactive) (save-excursion (let ((filename (expand-file-name elmo-passwd-alist-file-name - elmo-msgdb-dir)) - (tmp-buffer (get-buffer-create " *elmo-passwd-alist-tmp*"))) + elmo-msgdb-dir)) + (tmp-buffer (get-buffer-create " *elmo-passwd-alist-tmp*"))) (set-buffer tmp-buffer) (erase-buffer) (prin1 elmo-passwd-alist tmp-buffer) @@ -432,11 +432,11 @@ Return value is a cons cell of (STRUCTURE . REST)" ;;; (not (equal 384 (file-modes filename)))) ;;; (error "%s is not safe.chmod 600 %s!" filename filename)) (if (file-writable-p filename) - (progn - (write-region (point-min) (point-max) - filename nil 'no-msg) - (set-file-modes filename 384)) - (message (format "%s is not writable." filename))) + (progn + (write-region (point-min) (point-max) + filename nil 'no-msg) + (set-file-modes filename 384)) + (message (format "%s is not writable." filename))) (kill-buffer tmp-buffer)))) (defun elmo-get-passwd (key) @@ -470,19 +470,19 @@ Return value is a cons cell of (STRUCTURE . REST)" (defmacro elmo-read-char-exclusive () (cond ((featurep 'xemacs) - '(let ((table (quote ((backspace . ?\C-h) (delete . ?\C-?) - (left . ?\C-h)))) - event key) - (while (not - (and - (key-press-event-p (setq event (next-command-event))) - (setq key (or (event-to-character event) - (cdr (assq (event-key event) table))))))) - key)) - ((fboundp 'read-char-exclusive) - '(read-char-exclusive)) - (t - '(read-char)))) + '(let ((table (quote ((backspace . ?\C-h) (delete . ?\C-?) + (left . ?\C-h)))) + event key) + (while (not + (and + (key-press-event-p (setq event (next-command-event))) + (setq key (or (event-to-character event) + (cdr (assq (event-key event) table))))))) + key)) + ((fboundp 'read-char-exclusive) + '(read-char-exclusive)) + (t + '(read-char)))) (defun elmo-read-passwd (prompt &optional stars) "Read a single line of text from user without echoing, and return it." @@ -549,12 +549,12 @@ Return value is a cons cell of (STRUCTURE . REST)" (setq tlist (cdr tlist))) (setq str (concat str ")"))) - (setq str + (setq str (if (symbolp tlist) (symbol-name tlist) tlist))) str)) - + (defun elmo-plug-on-by-servers (alist &optional servers) (let ((server-list (or servers elmo-plug-on-servers))) @@ -877,7 +877,7 @@ Return value is a cons cell of (STRUCTURE . REST)" '("last" "first" "from" "subject" "to" "cc" "since" "before")))))) - + (defun elmo-buffer-field-condition-match (condition number number-list) (cond ((vectorp condition) @@ -959,10 +959,10 @@ Emacs 19.28 or earlier does not have `unintern'." (defun elmo-make-hash (&optional hashsize) "Make a new hash table which have HASHSIZE size." (make-vector - (if hashsize + (if hashsize (max ;; Prime numbers as lengths tend to result in good - ;; hashing; lengths one less than a power of two are + ;; hashing; lengths one less than a power of two are ;; also good. (min (let ((i 1)) @@ -1513,7 +1513,7 @@ NUMBER-SET is altered." (store-match-data nil) (while (string-match regexp string (match-end 0)) (setq list (cons (substring string (match-beginning matchn) - (match-end matchn)) list))) + (match-end matchn)) list))) (nreverse list))) ;;; File cache. diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el index 5e5eeb0..d501215 100644 --- a/elmo/elmo-vars.el +++ b/elmo/elmo-vars.el @@ -1,4 +1,4 @@ -;;; elmo-vars.el -- User variables for ELMO. +;;; elmo-vars.el --- User variables for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -24,10 +24,10 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (require 'poe) ;; silence byte compiler diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el index a418eb4..bce592c 100644 --- a/elmo/elmo-version.el +++ b/elmo/elmo-version.el @@ -1,4 +1,4 @@ -;;; elmo-version.el -- Version information for ELMO. +;;; elmo-version.el --- Version information for ELMO. ;; Copyright (C) 2000-2001 Yuuichi Teranishi ;; Copyright (C) 2000-2001 TAKAHASHI Kaoru diff --git a/elmo/elmo.el b/elmo/elmo.el index 88bcda4..1cc9ba7 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -1,4 +1,4 @@ -;;; elmo.el -- Elisp Library for Message Orchestration +;;; elmo.el --- Elisp Library for Message Orchestration. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -1187,7 +1187,7 @@ FIELD is a symbol of the field." (elmo-folder-set-msgdb-internal folder (elmo-msgdb-clear))) (defun elmo-folder-synchronize (folder - new-mark ;"N" + new-mark ;"N" unread-uncached-mark ;"U" unread-cached-mark ;"!" read-uncached-mark ;"u" diff --git a/elmo/pldap.el b/elmo/pldap.el index 9437722..6d3d383 100644 --- a/elmo/pldap.el +++ b/elmo/pldap.el @@ -1,4 +1,4 @@ -;;; pldap.el -- A portable LDAP support for Emacs. +;;; pldap.el --- A portable LDAP support for Emacs. ;; Copyright (C) 1998 Free Software Foundation, Inc. ;; Copyright (C) 2000 Yuuichi Teranishi @@ -34,7 +34,7 @@ ;;; Commentary: ;;; Code: -;; +;; (eval-when-compile (require 'cl)) @@ -792,7 +792,7 @@ entry according to the value of WITHDN." nil) (t (error "Wrong LDAP boolean string: %s" str)))) - + (defun ldap-encode-country-string (str) "Encode STR to LDAP country string." ;; We should do something useful here... @@ -822,7 +822,7 @@ entry according to the value of WITHDN." "$")) ;;; LDAP protocol functions -;; +;; (defun ldap-get-host-parameter (host parameter) "Get HOST's PARAMETER in `ldap-host-parameters-alist'." (plist-get (cdr (assoc host ldap-host-parameters-alist)) @@ -845,7 +845,7 @@ and the corresponding decoder is then retrieved from (if encoder (cons name (mapcar encoder values)) attr))) - + (defun ldap-decode-attribute (attr) "Decode the attribute/value pair ATTR according to LDAP rules. The attribute name is looked up in `ldap-attribute-syntaxes-alist' @@ -865,7 +865,7 @@ and the corresponding decoder is then retrieved from (cons name (mapcar decoder values)) attr)) attr)) - + (defun ldap-search (arg1 &rest args) "Perform an LDAP search.if ARG1 is LDAP object, invoke `ldap-search-basic'. Otherwise, invoke `ldap-search-entries'. ARGS are passed to each function." diff --git a/elmo/slp.el b/elmo/slp.el index 88ed9d4..42cbb25 100644 --- a/elmo/slp.el +++ b/elmo/slp.el @@ -27,7 +27,7 @@ ;; ;; slp.el is an elisp library providing an interface for SLP (RFC2614) ;; using OpenSLP(http://www.openslp.org/) slptool . -;; +;; ;;; History: ;; 28 Aug 2001 Created. @@ -50,7 +50,7 @@ (defun slp-exec-wait (type &rest args) "Synchronous execution of slp-program. TYPE is a symbol (one of `srvs', `attrs', `srvtypes', `as-is', `ignore')." - (with-temp-buffer + (with-temp-buffer (let ((result (apply 'call-process slp-program nil t nil (append slp-program-arguments (delq nil args))))) (unless (zerop result)