* wl-summary.el (wl-summary-cursor-move): If return value of

wl-summary-next-message is not number, don't jump.

* elmo-util.el (elmo-get-network-stream-type): Moved to elmo-net.el.

* elmo-net.el (elmo-get-network-stream-type): Moved from elmo-util.el
and re-written.

* elmo-imap4.el (elmo-folder-initialize): Use
elmo-get-network-stream-type.

* elmo-nntp.el (elmo-folder-initialize): Ditto.

* elmo-pop3.el (elmo-folder-initialize): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 5310d75..ea3f104 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,17 @@
+2001-06-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-util.el (elmo-get-network-stream-type): Moved to elmo-net.el.
+
+       * elmo-net.el (elmo-get-network-stream-type): Moved from elmo-util.el
+       and re-written.
+
+       * elmo-imap4.el (elmo-folder-initialize): Use
+       elmo-get-network-stream-type.
+
+       * elmo-nntp.el (elmo-folder-initialize): Ditto.
+
+       * elmo-pop3.el (elmo-folder-initialize): Ditto.
+
 2001-06-19  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo.el (elmo-message-encache): Set unread argument for

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index d7339e6..e7dfdc2 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1800,7 +1800,8 @@ Return nil if no complete line has arrived."
        (unless (elmo-net-folder-stream-type-internal folder)
          (elmo-net-folder-set-stream-type-internal
           folder
-          elmo-imap4-default-stream-type))
+          (elmo-get-network-stream-type
+           elmo-imap4-default-stream-type)))
        folder))))
 
 ;;; ELMO IMAP4 folder

diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index 0938c05..bde1207 100644 (file)
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -265,6 +265,18 @@ Returns a process object.  if making session failed, returns nil."
        (elmo-set-plugged t server service stream-type))
       process)))
 
+(defun elmo-get-network-stream-type (symbol)
+  "Return network stream type corresponding to SYMBOL.
+Returned value is searched from `elmo-network-stream-type-alist'."
+  (let ((alist elmo-network-stream-type-alist)
+       spec)
+    (while alist
+      (when (eq (nth 1 (car alist)) symbol)
+       (setq spec (car alist))
+       (setq alist nil))
+      (setq alist (cdr alist)))
+    spec))
+
 (luna-define-method elmo-folder-initialize ((folder
                                             elmo-net-folder)
                                            name)

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index cf3c2c4..9c31782 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -115,7 +115,8 @@ This is taken precedence over `elmo-network-stream-type-alist'.")
       (unless (elmo-net-folder-stream-type-internal folder)
        (elmo-net-folder-set-stream-type-internal
         folder
-        elmo-nntp-default-stream-type))
+        (elmo-get-network-stream-type
+         elmo-nntp-default-stream-type)))
       folder)))
 
 (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-nntp-folder))

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 246aba9..23660a4 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -153,7 +153,8 @@ Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
     (unless (elmo-net-folder-stream-type-internal folder)
       (elmo-net-folder-set-stream-type-internal
        folder
-       elmo-pop3-default-stream-type))
+       (elmo-get-network-stream-type
+       elmo-pop3-default-stream-type)))
     folder))
 
 ;;; POP3 session

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index f2b0e57..dbd4a5e 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -142,13 +142,6 @@ File content is encoded with MIME-CHARSET."
 ;;;(princ "\n" (current-buffer))
    (elmo-save-buffer filename mime-charset)))
 
-(defun elmo-get-network-stream-type (stream-type stream-type-alist)
-  (catch 'found
-    (while stream-type-alist
-      (if (eq (nth 1 (car stream-type-alist)) stream-type)
-         (throw 'found (car stream-type-alist)))
-      (setq stream-type-alist (cdr stream-type-alist)))))
-
 ;;; Search Condition
 
 (defconst elmo-condition-atom-regexp "[^/ \")|&]*")

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 19758fd..ee0b3ed 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-cursor-move): If return value of
+       wl-summary-next-message is not number, don't jump.
+
 2001-06-19  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-summary.el (wl-summary-buffer-next-message-function): New

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 896ebf5..e258dab 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4352,7 +4352,8 @@ If ARG, exit virtual folder."
   (let (num)
     (when (setq num (wl-summary-next-message (wl-summary-message-number)
                                             direction hereto))
-      (wl-thread-jump-to-msg num)
+      (if (numberp num)
+         (wl-thread-jump-to-msg num))
       t)))
 ;;
 ;; Goto unread or important