Use scroll-up and scroll-down in MIME-View-mode.

diff --git a/ChangeLog b/ChangeLog
index fe9d985..b1d5750 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-09-20  Yoshiki Hayashi <t90553@mail.ecc.u-tokyo.ac.jp>
+
+       * mime-view.el (mime-preview-scroll-up-entitiy,
+       mime-preview-scroll-down-entity): Use scroll-up and scroll-down
+       instead of forward-line.
+       (mime-preview-next-line-entity,
+       mime-preview-previous-line-entity): Add optional argument LINES
+       and scroll LINES lines if specified. Add doc-string.
+
 1999-09-13  MORIOKA Tomohiko  <tomo@m17n.org>
 
        * SEMI: Version 1.13.6 (Komatsu) released.
@@ -24,7 +33,7 @@
 \f
 1999-08-18  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * REMI: Version 1.13.2 (\e-DÒike-Ikoinomori)\e-A released.
+       * REMI: Version 1.13.2 (\e.D\8eÒike-Ikoinomori) released.
 
 1999-08-17  Katsumi Yamaoka   <yamaoka@jpl.org>
 
@@ -95,7 +104,7 @@
 \f
 1999-07-27  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * SEMI: Version 1.13.5 (Meih\e-Dò)\e-A released.
+       * SEMI: Version 1.13.5 (Meih\8eò) released.
 
 1999-07-27  MORIOKA Tomohiko  <tomo@m17n.org>
 
@@ -398,7 +407,7 @@
 \f
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.13.0 (Matt\e-Dò)\e-A released.
+       * SEMI: Version 1.13.0 (Matt\8eò) released.
 
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -896,7 +905,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.3 (Ecch\e-Dþ-Nakagawa)\e-A released.
+       * REMI: Version 1.8.3 (Ecch\8eþ-Nakagawa) released.
 
        * mime-play.el (mime-delq-null-situation): Add new optional
        argument `ignored-value'.
@@ -925,7 +934,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.2 (N\e-Dòmachi)\e-A released.
+       * REMI: Version 1.8.2 (N\8eòmachi) released.
 
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -1044,7 +1053,7 @@
 \f
 1998-06-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.0 (Ecch\e-Dþ-Kokubu)\e-A released.
+       * REMI: Version 1.8.0 (Ecch\8eþ-Kokubu) released.
 
 1998-06-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -1880,7 +1889,7 @@
 \f
 1998-06-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.5.0 (Nishi-Ny\e-Dþzen)\e-A released.
+       * SEMI: Version 1.5.0 (Nishi-Ny\8eþzen) released.
 
        * README.en (Required environment): Modify for FLIM 1.3.0.
 
@@ -1932,7 +1941,7 @@
 \f
 1998-06-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.6 (Ny\e-Dþzen)\e-A released.
+       * SEMI: Version 1.4.6 (Ny\8eþzen) released.
 
 1998-05-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2145,7 +2154,7 @@
 \f
 1998-05-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.4 (Ecch\e-Dþ-Miyazaki)\e-A released.
+       * SEMI: Version 1.4.4 (Ecch\8eþ-Miyazaki) released.
 
        * mime-play.el (mime-mailcap-method-filename-alist): New variable.
        (mime-mailcap-method-sentinel): New function.
@@ -2271,7 +2280,7 @@
 \f
 1998-05-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.1 (\e-DÒmi)\e-A released.
+       * SEMI: Version 1.4.1 (\8eÒmi) released.
 
        * README.en (Required environment): Modify for FLIM 1.2.0.
 
@@ -2431,7 +2440,7 @@
 \f
 1998-04-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.3.2 (N\e-Dò)\e-A was released.
+       * SEMI: Version 1.3.2 (N\8eò) was released.
 
        * mime-edit.el (mime-edit-mode-entity-prefix): New variable.
        (mime-edit-mode-entity-map): New variable.
@@ -3086,7 +3095,7 @@
 \f
 1998-03-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae)\e-A was released.
+       * SEMI: Version 1.0.2 (Nonoichi-K\8eòdaimae) was released.
 
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -3169,7 +3178,7 @@
        * mime-file.el: Rename `mime-article/extract-file' ->
        `mime-extract-current-entity'.
 
-1998-03-03  François Pinard   <pinard@iro.umontreal.ca>
+1998-03-03  Fran\e.A\8eçois Pinard   <pinard@iro.umontreal.ca>
 
        * mime-edit.el (mime-edit-insert-signature): Function
        `mime-edit-insert-tag' is sometimes called with more arguments
@@ -3198,7 +3207,7 @@
 \f
 1998-02-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae)\e-A was released.
+       * SEMI: Version 1.0.0 (Nukaj\e.D\8eþtaku-mae) was released.
 
        * SEMI-ELS: Remove mime-tar.el.
 
@@ -3335,14 +3344,14 @@
 \f
 1997-11-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 0.116 (D\e-Dòhòji)\e-A was released.
+       * SEMI: Version 0.116 (D\8eòh\8eòji) was released.
 
 1997-11-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * mime-view.el, mime-pgp.el, mime-partial.el: Rename
        `mime::article/content-info' -> `mime-raw-content-info'.
 
-1997-11-11  François Pinard   <pinard@iro.umontreal.ca>
+1997-11-11  Fran\e.A\8eçois Pinard   <pinard@iro.umontreal.ca>
 
        * mime-edit.el: Modify space in prompt and removespurious trailing
        spaces in the files. (cf. [tm-en:1507])

diff --git a/mime-view.el b/mime-view.el
index 964c687..04efc7d 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -1346,22 +1346,23 @@ variable `mime-preview-over-to-next-method-alist'."
 If reached to (point-max), it calls function registered in variable
 `mime-preview-over-to-next-method-alist'."
   (interactive)
-  (or h
-      (setq h (1- (window-height)))
-      )
-  (if (= (point) (point-max))
+  (if (eobp)
       (let ((f (assq (mime-preview-original-major-mode)
-                     mime-preview-over-to-next-method-alist)))
-        (if f
-            (funcall (cdr f))
-          ))
+                    mime-preview-over-to-next-method-alist)))
+       (if f
+           (funcall (cdr f))
+         ))
     (let ((point
           (or (next-single-property-change (point) 'mime-view-entity)
-              (point-max))))
-      (forward-line h)
-      (if (> (point) point)
-          (goto-char point)
-        )
+              (point-max)))
+         (bottom (window-end (selected-window))))
+      (if (and (not h)
+              (> bottom point))
+         (goto-char point)
+       (condition-case nil
+           (scroll-up h)
+         (end-of-buffer
+          (goto-char (point-max)))))
       )))
 
 (defun mime-preview-scroll-down-entity (&optional h)
@@ -1369,34 +1370,39 @@ If reached to (point-max), it calls function registered in variable
 If reached to (point-min), it calls function registered in variable
 `mime-preview-over-to-previous-method-alist'."
   (interactive)
-  (or h
-      (setq h (1- (window-height)))
-      )
-  (if (= (point) (point-min))
+  (if (bobp)
       (let ((f (assq (mime-preview-original-major-mode)
                     mime-preview-over-to-previous-method-alist)))
-        (if f
-            (funcall (cdr f))
-          ))
+       (if f
+           (funcall (cdr f))
+         ))
     (let ((point
           (or (previous-single-property-change (point) 'mime-view-entity)
-              (point-min))))
-      (forward-line (- h))
-      (if (< (point) point)
-          (goto-char point)
-        ))))
+              (point-min)))
+         (top (window-start (selected-window))))
+      (if (and (not h)
+              (< top point))
+         (goto-char point)
+       (condition-case nil
+           (scroll-down h)
+         (beginning-of-buffer
+          (goto-char (point-min)))))
+      )))
 
-(defun mime-preview-next-line-entity ()
-  (interactive)
-  (mime-preview-scroll-up-entity 1)
+(defun mime-preview-next-line-entity (&optional lines)
+  "Scroll up one line (or prefix LINES lines).
+If LINES is negative, scroll down LINES lines."
+  (interactive "p")
+  (mime-preview-scroll-up-entity (or lines 1))
   )
 
-(defun mime-preview-previous-line-entity ()
-  (interactive)
-  (mime-preview-scroll-down-entity 1)
+(defun mime-preview-previous-line-entity (&optional lines)
+  "Scrroll down one line (or prefix LINES lines).
+If LINES is negative, scroll up LINES lines."
+  (interactive "p")
+  (mime-preview-scroll-down-entity (or lines 1))
   )
 
-
 ;;; @@ quitting
 ;;;