From: yamaoka <yamaoka>
Date: Tue, 5 Oct 1999 04:25:13 +0000 (+0000)
Subject: Sync up with semi-1_13.
X-Git-Tag: semi-pgpgpg_20~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ebfab05cfded2ce92b41e66e9cafe84e7e1050b0;p=elisp%2Fsemi.git

Sync up with semi-1_13.
---

diff --git a/ChangeLog b/ChangeLog
index 234ad2c..9fddb7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-10-05  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
+
+	* mime-view.el (mime-preview-scroll-down-entity,
+	mime-preview-scroll-up-entity): Recenter when moving to
+	a next entity.
+	(mime-preview-move-scroll): New variable.
+	(mime-preview-move-to-previous, mime-preview-move-to-next):
+	Recenter according to the variable mime-preview-move-scroll.
+
 1999-10-04  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* mime-view.el (mime-preview-move-to-next): Attempt to go to the
diff --git a/mime-view.el b/mime-view.el
index a80a295..b93053a 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -62,6 +62,15 @@
   :group 'mime-view
   :type 'file)
 
+(defcustom mime-preview-move-scroll nil
+  "*Decides whether to scroll when moving to next entity.
+When t, scroll the buffer. Non-nil but not t means scroll when
+the next entity is within next-screen-context-lines from top or
+buttom. Nil means don't scroll at all."
+  :group 'mime-view
+  :type '(choice (const :tag "Off" nil)
+		 (const :tag "On" t)
+		 (sexp :tag "Situation" 1)))
 
 ;;; @ in raw-buffer (representation space)
 ;;;
@@ -1298,7 +1307,17 @@ variable `mime-preview-over-to-previous-method-alist'."
     (if (and point
 	     (>= point (point-min)))
 	(if (get-text-property (1- point) 'mime-view-entity)
-	    (goto-char point)
+	    (progn (goto-char point)
+		   (if
+		    (or (eq mime-preview-move-scroll t)
+			(and mime-preview-move-scroll
+			     (<= point
+				(save-excursion
+				  (move-to-window-line 0)
+				  (forward-line next-screen-context-lines)
+				  (end-of-line)
+				  (point)))))
+			(recenter (* -1 next-screen-context-lines))))
 	  (goto-char (1- point))
 	  (mime-preview-move-to-previous)
 	  )
@@ -1325,6 +1344,17 @@ variable `mime-preview-over-to-next-method-alist'."
 	  (goto-char point)
 	  (if (null (get-text-property point 'mime-view-entity))
 	      (mime-preview-move-to-next)
+	    (and
+	     (or (eq mime-preview-move-scroll t)
+		 (and mime-preview-move-scroll
+		      (>= point
+			 (save-excursion
+			   (move-to-window-line -1)
+			   (forward-line
+			    (* -1 next-screen-context-lines))
+			   (beginning-of-line)
+			   (point)))))
+		 (recenter next-screen-context-lines))
 	    ))
       (let ((f (assq (mime-preview-original-major-mode)
 		     mime-preview-over-to-next-method-alist)))
@@ -1350,7 +1380,8 @@ If reached to (point-max), it calls function registered in variable
 	  (bottom (window-end (selected-window))))
       (if (and (not h)
 	       (> bottom point))
-	  (goto-char point)
+	  (progn (goto-char point)
+		 (recenter next-screen-context-lines))
 	(condition-case nil
 	    (scroll-up h)
 	  (end-of-buffer
@@ -1374,7 +1405,8 @@ If reached to (point-min), it calls function registered in variable
 	  (top (window-start (selected-window))))
       (if (and (not h)
 	       (< top point))
-	  (goto-char point)
+	  (progn (goto-char point)
+		 (recenter (* -1 next-screen-context-lines)))
 	(condition-case nil
 	    (scroll-down h)
 	  (beginning-of-buffer