* acap.el (acap-parse-response): Fix comment-out style. Use three

semicolons, that should start at the left margin.
See. also (Info-goto-node "(elisp)Comment Tips").
* elmo.el (toplevel, elmo-message-match-condition)
(elmo-folder-set-info-max-by-numdb, elmo-folder-move-messages):
Ditto.
* elmo-archive.el (elmo-archive-suffix-alist)
(elmo-archive-tar-method-alist, elmo-archive-tgz-method-alist)
(elmo-archive-method-list)
(elmo-archive-msgdb-create-as-numlist-subr2, elmo-folder-search):
Ditto.
* elmo-imap4.el	(toplevel)
(elmo-imap4-send-command, elmo-imap4-check-validity)
(elmo-imap4-fetch-callback-1-subr)
(elmo-network-initialize-session, elmo-server-diff-async)
(elmo-imap4-folder-diff-plugged): Ditto
* elmo-maildir.el (elmo-maildir-temporal-filename): Ditto.
* elmo-msgdb.el (elmo-msgdb-append-element): Ditto.
* elmo-net.el (elmo-network-close-session): Ditto.
* elmo-nntp.el (elmo-nntp-create-msgdb-from-overview-string)
(elmo-nntp-parse-overview-string, elmo-nntp-post): Ditto.
* elmo-pop3.el (elmo-pop3-retrieve-headers):  Ditto.
* elmo-util.el (elmo-set-auto-coding, elmo-passwd-alist-save)
(elmo-number-set-delete)
(elmo-cache-get-oldest-cache-file-entity): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index ab87c8e..2023b9d 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,31 @@
+2010-01-05  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * acap.el (acap-parse-response): Fix comment-out style. Use three
+       semicolons, that should start at the left margin.
+       See. also (Info-goto-node "(elisp)Comment Tips").
+       * elmo.el (toplevel, elmo-message-match-condition)
+       (elmo-folder-set-info-max-by-numdb, elmo-folder-move-messages):
+       Ditto.
+       * elmo-archive.el (elmo-archive-suffix-alist)
+       (elmo-archive-tar-method-alist, elmo-archive-tgz-method-alist)
+       (elmo-archive-method-list)
+       (elmo-archive-msgdb-create-as-numlist-subr2, elmo-folder-search):
+       Ditto.
+       * elmo-imap4.el (toplevel)
+       (elmo-imap4-send-command, elmo-imap4-check-validity)
+       (elmo-imap4-fetch-callback-1-subr)
+       (elmo-network-initialize-session, elmo-server-diff-async)
+       (elmo-imap4-folder-diff-plugged): Ditto
+       * elmo-maildir.el (elmo-maildir-temporal-filename): Ditto.
+       * elmo-msgdb.el (elmo-msgdb-append-element): Ditto.
+       * elmo-net.el (elmo-network-close-session): Ditto.
+       * elmo-nntp.el (elmo-nntp-create-msgdb-from-overview-string)
+       (elmo-nntp-parse-overview-string, elmo-nntp-post): Ditto.
+       * elmo-pop3.el (elmo-pop3-retrieve-headers):  Ditto.
+       * elmo-util.el (elmo-set-auto-coding, elmo-passwd-alist-save)
+       (elmo-number-set-delete)
+       (elmo-cache-get-oldest-cache-file-entity): Ditto.
+
 2010-01-04  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * elmo-version.el (elmo-version): Up to 2.15.8.

diff --git a/elmo/acap.el b/elmo/acap.el
index 7047dcd..c2ad7e3 100644 (file)
--- a/elmo/acap.el
+++ b/elmo/acap.el
@@ -812,7 +812,8 @@ ENTRIES is a store-entry list."
                             (progn
                               (acap-forward)
                               (acap-parse-return-data-list)))))
-         (ALERT ;(cons 'alert (acap-parse-resp-body))
+         (ALERT
+;;;       (cons 'alert (acap-parse-resp-body))
           (message "%s" (nth 1 (acap-parse-resp-body))))
          ((BYE Bye bye)
           (cons 'bye (acap-parse-resp-body)))
@@ -834,7 +835,8 @@ ENTRIES is a store-entry list."
          ;; response-stat
          (OK   (cons 'stat-ok (acap-parse-resp-body)))
          (NO   (cons 'stat-no (acap-parse-resp-body)))
-         (BAD  ;(cons 'stat-bad (acap-parse-resp-body))
+         (BAD
+;;;       (cons 'stat-bad (acap-parse-resp-body))
           ;; XXX cyrus-sml-acap does not return tagged bad response?
           (error "%s" (nth 1 (acap-parse-resp-body))))))
        ((integerp token)

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index f0d3b84..6cef64a 100644 (file)
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -147,11 +147,11 @@
 
 (defvar elmo-archive-suffix-alist
    '((lha . ".lzh")  ; default
-;;;  (lha . ".lzs")
+;;;     (lha . ".lzs")
      (zip . ".zip")
      (zoo . ".zoo")
-;;;  (arc . ".arc")
-;;;  (arj . ".arj")
+;;;     (arc . ".arc")
+;;;     (arj . ".arj")
      (rar . ".rar")
      (tar . ".tar")
      (tgz . ".tar.gz")))
@@ -219,7 +219,7 @@
     '((ls    . ("gtar" "-tf"))
       (cat   . ("gtar" "-Oxf"))
       (ext   . ("gtar" "-xf"))
-;;;    (rm    . ("gtar" "--delete" "-f")) ;; well not work
+;;;      (rm    . ("gtar" "--delete" "-f")) ;; well not work
       )))
 
 ;;; GNU tar (*.tar.gz, *.tar.Z, *.tar.bz2)
@@ -227,7 +227,7 @@
   '((ls         . ("gtar" "-ztf"))
     (cat        . ("gtar" "-Ozxf"))
     (create     . ("gtar" "-zcf"))
-;;; (rm         . elmo-archive-tgz-rm-func)
+;;;    (rm         . elmo-archive-tgz-rm-func)
     (cp         . elmo-archive-tgz-cp-func)
     (mv         . elmo-archive-tgz-mv-func)
     (ext        . ("gtar" "-zxf"))
@@ -235,17 +235,17 @@
     (decompress . ("gzip" "-d"))
     (compress   . ("gzip"))
     (append     . ("gtar" "-uf"))
-;;; (delete     . ("gtar" "--delete" "-f")) ; well not work
+;;;    (delete     . ("gtar" "--delete" "-f")) ; well not work
     ))
 
 (defvar elmo-archive-method-list
   '(elmo-archive-lha-method-alist
     elmo-archive-zip-method-alist
     elmo-archive-zoo-method-alist
-;;; elmo-archive-tar-method-alist
+;;;    elmo-archive-tar-method-alist
     elmo-archive-tgz-method-alist
-;;; elmo-archive-arc-method-alist
-;;; elmo-archive-arj-method-alist
+;;;    elmo-archive-arc-method-alist
+;;;    elmo-archive-arj-method-alist
     elmo-archive-rar-method-alist))
 
 ;;; Internal vars.
@@ -1003,7 +1003,7 @@ TYPE specifies the archiver's symbol."
          (elmo-msgdb-append
           new-msgdb
           (elmo-archive-parse-mmdf folder msgs flag-table)))
-;;;     ((looking-at delim2)   ;; UNIX MAIL
+;;;     ((looking-at delim2)           ; UNIX MAIL
 ;;;      (elmo-msgdb-append
 ;;;       new-msgdb
 ;;;       (elmo-archive-parse-unixmail msgs flag-table)))
@@ -1060,12 +1060,11 @@ TYPE specifies the archiver's symbol."
 
 (luna-define-method elmo-folder-search ((folder elmo-archive-folder)
                                        condition &optional from-msgs)
-  (let* (;;(args (elmo-string-to-list key))
-        ;; XXX: I don't know whether `elmo-archive-list-folder'
-        ;;      updates match-data.
-        ;; (msgs (or from-msgs (elmo-archive-list-folder spec)))
+  (let* ((case-fold-search nil)
+;;;     (args (elmo-string-to-list key))
+;;; XXX: I don't know whether `elmo-archive-list-folder' updates match-data.
+;;;     (msgs (or from-msgs (elmo-archive-list-folder spec)))
         (msgs (or from-msgs (elmo-folder-list-messages folder)))
-        (case-fold-search nil)
         ret-val)
     (elmo-with-progress-display (elmo-folder-search (length msgs)) "Searching"
       (dolist (number msgs)

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index d1193c2..7024ce3 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -273,13 +273,13 @@ Debug information is inserted in the buffer \"*IMAP4 DEBUG*\"")
 
 ;;; Session commands.
 
-; (defun elmo-imap4-send-command-wait (session command)
-;   "Send COMMAND to the SESSION and wait for response.
-; Returns RESPONSE (parsed lisp object) of IMAP session."
-;   (elmo-imap4-read-response session
-;                          (elmo-imap4-send-command
-;                           session
-;                           command)))
+;;;(defun elmo-imap4-send-command-wait (session command)
+;;;  "Send COMMAND to the SESSION and wait for response.
+;;;Returns RESPONSE (parsed lisp object) of IMAP session."
+;;;  (elmo-imap4-read-response session
+;;;                        (elmo-imap4-send-command
+;;;                         session
+;;;                         command)))
 
 (defun elmo-imap4-send-command-wait (session command)
   "Send COMMAND to the SESSION.
@@ -303,7 +303,8 @@ Returns a TAG string which is assigned to the COMMAND."
                        (number-to-string
                         (setq elmo-imap4-seqno (+ 1 elmo-imap4-seqno)))))
       (setq cmdstr (concat tag " "))
-      ;; (erase-buffer) No need.
+;;; No need.
+;;;      (erase-buffer)
       (goto-char (point-min))
       (when (elmo-imap4-response-bye-p elmo-imap4-current-response)
        (elmo-imap4-process-bye session))
@@ -736,9 +737,9 @@ Returns response value if selecting folder succeed. "
 ;;;(elmo-imap4-send-command-wait
 ;;;(elmo-imap4-get-session spec)
 ;;;(list "status "
-;;;     (elmo-imap4-mailbox
-;;;      (elmo-imap4-spec-mailbox spec))
-;;;     " (uidvalidity)")))
+;;;      (elmo-imap4-mailbox
+;;;       (elmo-imap4-spec-mailbox spec))
+;;;      " (uidvalidity)")))
   )
 
 (defun elmo-imap4-sync-validity  (spec validity-file)
@@ -875,8 +876,8 @@ If CHOP-LENGTH is not specified, message set is not chopped."
        (flag-table (car app-data))
        (msg-id (elmo-message-entity-field entity 'message-id))
        saved-flags flag-list)
-;;    (when (elmo-string-member-ignore-case "\\Flagged" flags)
-;;      (elmo-msgdb-global-mark-set msg-id elmo-msgdb-important-mark))
+;;;    (when (elmo-string-member-ignore-case "\\Flagged" flags)
+;;;      (elmo-msgdb-global-mark-set msg-id elmo-msgdb-important-mark))
     (setq saved-flags (elmo-flag-table-get flag-table msg-id)
          flag-list
          (if use-flag
@@ -980,11 +981,11 @@ If CHOP-LENGTH is not specified, message set is not chopped."
       (erase-buffer)
       (set-process-filter process 'elmo-imap4-arrival-filter)
       (set-process-sentinel process 'elmo-imap4-sentinel)
-;;;   (while (and (memq (process-status process) '(open run))
+;;;      (while (and (memq (process-status process) '(open run))
 ;;;              (eq elmo-imap4-status 'initial))
 ;;;    (message "Waiting for server response...")
 ;;;    (accept-process-output process 1))
-;;;   (message "")
+;;;      (message "")
       (unless (memq elmo-imap4-status '(nonauth auth))
        (signal 'elmo-open-error
                (list 'elmo-network-initialize-session)))
@@ -1203,8 +1204,8 @@ If CHOP-LENGTH is not specified, message set is not chopped."
 
 (luna-define-method elmo-server-diff-async ((folder elmo-imap4-folder))
   (let ((session (elmo-imap4-get-session folder)))
-    ;; commit.
-    ;; (elmo-imap4-commit spec)
+;;;    ;; commit.
+;;;    (elmo-imap4-commit spec)
     (with-current-buffer (elmo-network-session-buffer session)
       (setq elmo-imap4-status-callback
            'elmo-imap4-server-diff-async-callback-1)
@@ -2439,7 +2440,7 @@ If optional argument REMOVE is non-nil, remove FLAG."
 (defsubst elmo-imap4-folder-diff-plugged (folder)
   (let ((session (elmo-imap4-get-session folder))
        messages new unread response killed uidnext)
-;;; (elmo-imap4-commit spec)
+;;;    (elmo-imap4-commit spec)
     (with-current-buffer (elmo-network-session-buffer session)
       (setq elmo-imap4-status-callback nil)
       (setq elmo-imap4-status-callback-data nil))
@@ -2679,12 +2680,12 @@ If optional argument REMOVE is non-nil, remove FLAG."
            (elmo-imap4-get-session folder)))
     elmo-enable-disconnected-operation)) ; offline refile.
 
-;(luna-define-method elmo-message-fetch-unplugged
-;  ((folder elmo-imap4-folder)
-;   number strategy  &optional section outbuf unseen)
-;  (error "%d%s is not cached." number (if section
-;                                        (format "(%s)" section)
-;                                      "")))
+;;;(luna-define-method elmo-message-fetch-unplugged
+;;;  ((folder elmo-imap4-folder)
+;;;   number strategy  &optional section outbuf unseen)
+;;;  (error "%d%s is not cached." number (if section
+;;;                                      (format "(%s)" section)
+;;;                                    "")))
 
 (defsubst elmo-imap4-message-fetch (folder number strategy
                                           section outbuf unseen)

diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index a2393ef..2c29937 100644 (file)
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -405,7 +405,7 @@ file name for maildir directories."
       (make-directory (file-name-directory filename)))
     (while (file-exists-p filename)
 ;;; I don't want to wait.
-;;;   (sleep-for 2)
+;;;      (sleep-for 2)
       (setq filename
            (expand-file-name
             (concat "tmp/" (elmo-maildir-make-unique-string))

diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 774ec47..0a10cdf 100644 (file)
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -173,7 +173,7 @@ VALUE is the field value."
 ;;;
 (defsubst elmo-msgdb-append-element (list element)
   (if list
-;;;   (append list (list element))
+;;;      (append list (list element))
       (nconc list (list element))
     ;; list is nil
     (list element)))

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index 7abbd79..0c1e537 100644 (file)
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -113,7 +113,7 @@ If nil, just once. If t, until success."
 
 (luna-define-method elmo-network-close-session ((session elmo-network-session))
   (when (elmo-network-session-process-internal session)
-;;; (memq (process-status (elmo-network-session-process-internal session))
+;;;    (memq (process-status (elmo-network-session-process-internal session))
 ;;;      '(open run))
     (kill-buffer (process-buffer
                  (elmo-network-session-process-internal session)))

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index b7d35f7..9e57d86 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -716,11 +716,11 @@ Don't cache if nil.")
     (while ov-list
       (setq ov-entity (car ov-list))
 ;;; INN bug??
-;;;   (if (or (> (setq num (string-to-int (aref ov-entity 0)))
+;;;      (if (or (> (setq num (string-to-number (aref ov-entity 0)))
 ;;;             99999)
 ;;;          (<= num 0))
 ;;;      (setq num 0))
-;;;  (setq num (int-to-string num))
+;;;      (setq num (number-to-string num))
       (setq num (string-to-number (aref ov-entity 0)))
       (when (or (null numlist)
                (memq num numlist))
@@ -912,7 +912,7 @@ Don't cache if nil.")
        (forward-line 1)
        (setq beg (point))
        (setq ret-val (nconc ret-val (list ret-list))))
-;;;   (kill-buffer tmp-buffer)
+;;;      (kill-buffer tmp-buffer)
       ret-val)))
 
 (defun elmo-nntp-get-newsgroup-by-msgid (msgid server user port type)
@@ -998,7 +998,7 @@ Don't cache if nil.")
       (run-hooks 'elmo-nntp-post-pre-hook)
       (elmo-nntp-send-buffer session content-buf)
       (elmo-nntp-send-command session ".")
-;;;   (elmo-nntp-read-response buffer process t)
+;;;      (elmo-nntp-read-response buffer process t)
       (if (not (string-match
                "^2" (setq response (elmo-nntp-read-raw-response
                                     session))))

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 0f05663..ac755f3 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -651,7 +651,7 @@ until the login delay period has expired"))
          (elmo-pop3-send-command process
                                  (format "top %s 0" (car articles))
                                  'no-erase)
-         ;;;   (accept-process-output process 1)
+;;;      (accept-process-output process 1)
          (setq articles (cdr articles))
          (setq count (1+ count))
          ;; Every 200 requests we have to read the stream in
@@ -671,7 +671,7 @@ until the login delay period has expired"))
                     (< received count))
              (elmo-progress-notify 'elmo-retrieve-header :set received)
              (accept-process-output process 1)
-             ;;;           (accept-process-output process)
+;;;          (accept-process-output process)
              (discard-input)))))
       ;; Replace all CRLF with LF.
       (elmo-delete-cr-buffer)

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index e7934df..af9664f 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -170,7 +170,7 @@ with FILENAME which defaults to `buffer-file-name'."
              (goto-char (point-min))
              (setq case-fold-search nil)
              (re-search-forward "^;;;coding system: "
-                                ;;(+ (point-min) 3000) t))
+;;;                             (+ (point-min) 3000) t))
                                 nil t))
            (looking-at "[^\t\n\r ]+")
            (find-coding-system
@@ -571,7 +571,7 @@ Return value is a cons cell of (STRUCTURE . REST)"
          print-length print-level)
       (prin1 elmo-passwd-alist (current-buffer))
       (princ "\n" (current-buffer))
-;;;   (if (and (file-exists-p filename)
+;;;      (if (and (file-exists-p filename)
 ;;;           (not (equal 384 (file-modes filename))))
 ;;;      (error "%s is not safe.chmod 600 %s!" filename filename))
       (if (file-writable-p filename)
@@ -825,7 +825,7 @@ Return value is a cons cell of (STRUCTURE . REST)"
                             (directory-files path t "^[^\\.]")
                           (error nil)))
                  (result 0.0))
-             ;; (result (nth 7 file-attr))) ... directory size
+;;;          (result (nth 7 file-attr))) ; ... directory size
              (while files
                (setq result (+ result (or (elmo-disk-usage (car files)) 0)))
                (setq files (cdr files)))
@@ -1713,12 +1713,12 @@ NUMBER-SET is altered."
             prev
             (nconc
              (list
-              ;; (beg . (1- number))
+;;;           (beg . (1- number))
               (let ((new (cons (car elem) (1- number))))
                 (if (eq (car new) (cdr new))
                     (car new)
                   new))
-              ;; ((1+ number) . end)
+;;;           ((1+ number) . end)
               (let ((new (cons (1+ number) (cdr elem))))
                 (if (eq (car new) (cdr new))
                     (car new)
@@ -2073,7 +2073,7 @@ If KBYTES is kilo bytes (This value must be float)."
                                   (cons (car (car cfl))
                                         (car flist)))))
       (setq cfl (cdr cfl)))
-;;; (prin1 firsts)
+;;;    (prin1 firsts)
     (while firsts
       (if (and (not oldest-entity)
               (cdr (cdr (car firsts))))

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 007e63c..15c935e 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -860,7 +860,7 @@ Return a cons cell of (NUMBER-CROSSPOSTS . NEW-FLAG-ALIST).")
     (when (and filename (file-readable-p filename))
       (with-temp-buffer
        (set-buffer-multibyte nil)
-       ;;(insert-file-contents-as-binary filename)
+;;;    (insert-file-contents-as-binary filename)
        (elmo-message-fetch folder number
                            (elmo-make-fetch-strategy 'entire
                                                      (and cache t)
@@ -954,7 +954,8 @@ If optional argument IF-EXISTS is nil, load on demand.
   (elmo-folder-set-info-hashtb
    folder
    (if numbers (apply #'max numbers) 0)
-   nil ;;(length num-db)
+;;;   (length num-db)
+   nil
    ))
 
 (defun elmo-folder-get-info-max (folder)
@@ -1209,7 +1210,7 @@ Returns a list of message numbers successfully appended."
            result)
        (if no-delete
            (progn
-             ;; (message "Copying messages...done")
+;;;          (message "Copying messages...done")
              t)
          (if (eq len 0)
              (message "No message was moved.")
@@ -1450,10 +1451,10 @@ If Optional LOCAL is non-nil, don't update server flag."
   ;; Do nothing.
   )
 
-;;(luna-define-generic elmo-folder-append-message-entity (folder entity
-;;                                                            &optional
-;;                                                            flag-table)
-;;  "Append ENTITY to the folder.")
+;;;(luna-define-generic elmo-folder-append-message-entity (folder entity
+;;;                                                           &optional
+;;;                                                           flag-table)
+;;;  "Append ENTITY to the folder.")
 
 (defun elmo-msgdb-merge (folder msgdb-merge)
   "Return a list of messages which have duplicated message-id."