From: teranisi <teranisi>
Date: Thu, 12 Jul 2001 10:41:01 +0000 (+0000)
Subject: * wl-message.el (wl-message-prev-page): Do same bahavior as summary when
X-Git-Tag: wl-2_7_2~23
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=41af55d8b8ad5dbe093f2d349514b0c43ec71df5;p=elisp%2Fwanderlust.git

* wl-message.el (wl-message-prev-page): Do same bahavior as summary when
 it is called in the message buffer.
(wl-message-next-page): Ditto.

* elmo-pipe.el (elmo-folder-pack-numbers): Define.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 6f65e11..827ccd1 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* elmo-pipe.el (elmo-folder-pack-numbers): Define.
+
 2001-07-05  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo-imap4.el (elmo-imap4-find-next-line): Fixed
diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index b5d9237..a64d4bd 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -231,6 +231,9 @@
   (elmo-folder-mark-as-important (elmo-pipe-folder-dst-internal folder)
 				 numbers))
 
+(luna-define-method elmo-folder-pack-numbers ((folder elmo-pipe-folder))
+  (elmo-folder-pack-numbers (elmo-pipe-folder-dst-internal folder)))
+
 (require 'product)
 (product-provide (provide 'elmo-pipe) (require 'elmo-version))
 
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5429031..394bbd3 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-message.el (wl-message-prev-page): Do same bahavior
+	as summary when it is called in the message buffer.
+	(wl-message-next-page): Ditto.
+
 2001-07-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-summary.el (wl-summary-forward): Use cache if it is not
diff --git a/wl/wl-message.el b/wl/wl-message.el
index 5bdfa37..9e5665f 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -32,7 +32,7 @@
 (require 'wl-vars)
 (require 'wl-highlight)
 (require 'elmo)
-(require 'elmo-mime) ; XXX should modify for tm.
+(require 'elmo-mime)
 
 (eval-when-compile
   (if wl-use-semi
@@ -252,57 +252,69 @@ If ARG is specified, narrow to ARGth page."
   "Scroll down current message by LINES.
 Returns non-nil if top of message."
   (interactive)
-  (if (buffer-live-p wl-message-buffer)
-      (let ((cur-buf (current-buffer))
-	    top)
-	(wl-message-select-buffer wl-message-buffer)
-	(move-to-window-line 0)
-	(if (and wl-break-pages
-		 (bobp)
-		 (not (save-restriction (widen) (bobp))))
-	    (progn
-	      (wl-message-narrow-to-page -1)
-	      (goto-char (point-max))
-	      (recenter))
-	  (if (not (bobp))
-	      (condition-case nil
-		  (scroll-down lines)
-		(error))
-	    (setq top t)))
-	(select-window (get-buffer-window cur-buf))
-	top)))
+  (let (cur-buf top real-top)
+    (unless (eq major-mode 'mime-view-mode)
+      (when (buffer-live-p wl-message-buffer)
+	(setq cur-buf (current-buffer))
+	(wl-message-select-buffer wl-message-buffer)))
+    (move-to-window-line 0)
+    (if (and wl-break-pages
+	     (bobp)
+	     (not (setq real-top (save-restriction (widen) (bobp)))))
+	(progn
+	  (wl-message-narrow-to-page -1)
+	  (goto-char (point-max))
+	  (recenter))
+      (if (not (bobp))
+	  (condition-case nil
+	      (scroll-down lines)
+	    (error))
+	(setq top t)))
+    (if real-top
+	(let ((f (assq (mime-preview-original-major-mode)
+		       mime-preview-over-to-previous-method-alist)))
+	  (if f (funcall (cdr f))))
+      (when cur-buf
+	(select-window (get-buffer-window cur-buf))))
+    top))
 
 (defun wl-message-next-page (&optional lines)
   "Scroll up current message by LINES.
 Returns non-nil if bottom of message."
   (interactive)
-  (if (buffer-live-p wl-message-buffer)
-      (let ((cur-buf (current-buffer))
-	    bottom)
-	(wl-message-select-buffer wl-message-buffer)
-	(move-to-window-line -1)
-	(if (save-excursion
-	      (end-of-line)
-	      (and (pos-visible-in-window-p)
-		   (eobp)))
-	    (if (or (null wl-break-pages)
-		    (save-excursion
-		      (save-restriction
-			(widen) (forward-line) (eobp))))
-		(setq bottom t)
-	      (wl-message-narrow-to-page 1)
-	      (setq bottom nil))
-	  (condition-case ()
-	      (static-if (boundp 'window-pixel-scroll-increment)
-		  ;; XEmacs 21.2.20 and later.
-		  (let (window-pixel-scroll-increment)
-		    (scroll-up lines))
-		(scroll-up lines))	      
-	    (end-of-buffer
-	     (goto-char (point-max))))
+  (let (cur-buf bottom)
+    (unless (eq major-mode 'mime-view-mode)
+      (when (buffer-live-p wl-message-buffer)
+	(setq cur-buf (current-buffer))
+	(wl-message-select-buffer wl-message-buffer)))
+    (move-to-window-line -1)
+    (if (save-excursion
+	  (end-of-line)
+	  (and (pos-visible-in-window-p)
+	       (eobp)))
+	(if (or (null wl-break-pages)
+		(save-excursion
+		  (save-restriction
+		    (widen) (forward-line) (eobp))))
+	    (setq bottom t)
+	  (wl-message-narrow-to-page 1)
 	  (setq bottom nil))
-	(select-window (get-buffer-window cur-buf))
-	bottom)))
+      (condition-case ()
+	  (static-if (boundp 'window-pixel-scroll-increment)
+	      ;; XEmacs 21.2.20 and later.
+	      (let (window-pixel-scroll-increment)
+		(scroll-up lines))
+	    (scroll-up lines))	      
+	(end-of-buffer
+	 (goto-char (point-max))))
+      (setq bottom nil))
+    (if (eobp)
+	(let ((f (assq (mime-preview-original-major-mode)
+		       mime-preview-over-to-next-method-alist)))
+	  (if f (funcall (cdr f))))
+      (when cur-buf
+	(select-window (get-buffer-window cur-buf))))
+    bottom))
 
 
 (defun wl-message-follow-current-entity (buffer)