Sync up with the latest semi-1_13 branch.

diff --git a/ChangeLog b/ChangeLog
index c595dc1..b04d5fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-08-17  Katsumi Yamaoka   <yamaoka@jpl.org>
 
+       * mime-view.el (mime-preview-original-major-mode): Modify the way
+       of checking for the end of the buffer.
+
+1999-08-17  Katsumi Yamaoka   <yamaoka@jpl.org>
+
        * mime-view.el (mime-preview-original-major-mode): Don't use
        `get-text-property' at the end of the buffer.
 

diff --git a/mime-view.el b/mime-view.el
index 68ff42f..ad8c800 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -131,9 +131,10 @@ mother-buffer."
        (mime-preview-original-major-mode recursive)
        )
     (cdr (assq 'major-mode
-              (get-text-property (or point (if (eobp)
-                                               (1- (point-max))
-                                             (point)))
+              (get-text-property (or point
+                                     (if (> (point) (buffer-size))
+                                         (max (1- (point-max)) (point-min))
+                                       (point)))
                                  'mime-view-situation)))))