* elmo-maildir.el (elmo-folder-append-buffer): Create flag-table.

[elisp/wanderlust.git] / elmo / elmo-nntp.el

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 2ef6585..9d0eb95 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -417,7 +417,8 @@ Don't cache if nil.")
       (with-current-buffer outbuf
        (erase-buffer)
        (insert-buffer-substring (elmo-network-session-buffer session)
-                                start (- end 3))))
+                                start (- end 3))
+       (elmo-delete-cr-buffer)))
     t))
 
 (defun elmo-nntp-select-group (session group &optional force)
@@ -504,9 +505,9 @@ Don't cache if nil.")
                            (not (string= (elmo-nntp-folder-group-internal
                                           folder) "")))
                       (concat " active"
-                              (format " %s.*"
-                                      (elmo-nntp-folder-group-internal folder)
-                                      "")))))
+                              (format 
+                               " %s.*"
+                               (elmo-nntp-folder-group-internal folder))))))
          (if (elmo-nntp-read-response session t)
              (if (null (setq response (elmo-nntp-read-contents session)))
                  (error "NNTP List folders failed")
@@ -546,14 +547,14 @@ Don't cache if nil.")
            (progn
              (setq regexp
                    (format "^\\(%s[^. ]+\\)\\([. ]\\).*\n"
-                           (if (and
-                                (elmo-nntp-folder-group-internal folder)
-                                (null (string=
-                                       (elmo-nntp-folder-group-internal
-                                        folder) "")))
+                           (if (and (elmo-nntp-folder-group-internal folder)
+                                    (null (string=
+                                           (elmo-nntp-folder-group-internal
+                                            folder) "")))
                                (concat (elmo-nntp-folder-group-internal
                                         folder)
-                                       "\\.") "")))
+                                       "\\.")
+                             "")))
              (while (looking-at regexp)
                (setq top-ng (elmo-match-buffer 1))
                (if (string= (elmo-match-buffer 2) " ")
@@ -1378,10 +1379,8 @@ Returns a list of cons cells like (NUMBER . VALUE)"
        (elmo-display-progress
         'elmo-nntp-retrieve-headers "Getting headers..." 100))
       (message "Getting headers...done")
-      ;; Remove all "\r"'s.
-      (goto-char (point-min))
-      (while (search-forward "\r\n" nil t)
-       (replace-match "\n"))
+      ;; Replace all CRLF with LF.
+      (elmo-delete-cr-buffer)
       (copy-to-buffer outbuf (point-min) (point-max)))))
 
 ;; end of from Gnus