* wl-summary.el (wl-summary-next-message):

[elisp/wanderlust.git] / wl / wl-summary.el

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index cb9990e..ddea1ae 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4521,25 +4521,27 @@ If ARG, exit virtual folder."
        marked-list nums2)
     (unless hereto (setq nums (cdr nums)))
     (setq nums2 nums)
-    (catch 'done
-      (while cur-spec
-       (setq nums nums2)
-       (cond ((eq (car (car cur-spec)) 'p)
-              (if (setq marked-list (elmo-msgdb-list-messages-mark-match
-                                     wl-summary-buffer-msgdb
-                                     (cdr (car cur-spec))))
+    (if cur-spec
+       (catch 'done
+         (while cur-spec
+           (setq nums nums2)
+           (cond ((eq (car (car cur-spec)) 'p)
+                  (if (setq marked-list (elmo-msgdb-list-messages-mark-match
+                                         wl-summary-buffer-msgdb
+                                         (cdr (car cur-spec))))
+                      (while nums
+                        (if (memq (car nums) marked-list)
+                            (throw 'done (car nums)))
+                        (setq nums (cdr nums)))))
+                 ((eq (car (car cur-spec)) 't)
                   (while nums
-                    (if (memq (car nums) marked-list)
+                    (if (and wl-summary-buffer-target-mark-list
+                             (memq (car nums)
+                                   wl-summary-buffer-target-mark-list))
                         (throw 'done (car nums)))
                     (setq nums (cdr nums)))))
-             ((eq (car (car cur-spec)) 't)
-              (while nums
-                (if (and wl-summary-buffer-target-mark-list
-                         (memq (car nums)
-                               wl-summary-buffer-target-mark-list))
-                    (throw 'done (car nums)))
-                (setq nums (cdr nums)))))
-       (setq cur-spec (cdr cur-spec))))))
+           (setq cur-spec (cdr cur-spec))))
+      (car nums))))
 
 (defsubst wl-summary-cursor-move (direction hereto)
   (when (and (eq direction 'up)