Sync up with the latest semi-1_13 branch.

diff --git a/ChangeLog b/ChangeLog
index a214f70..3eae94e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 1999-08-02  MORIOKA Tomohiko  <tomo@m17n.org>
 
        * mime-view.el (mime-preview-follow-current-entity):

diff --git a/mime-view.el b/mime-view.el
index cb3a937..168a73d 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -131,7 +131,10 @@ mother-buffer."
        (mime-preview-original-major-mode recursive)
        )
     (cdr (assq 'major-mode
-              (get-text-property (or point (point)) 'mime-view-situation)))))
+              (get-text-property (or point (if (eobp)
+                                               (1- (point-max))
+                                             (point)))
+                                 'mime-view-situation)))))
 
 
 ;;; @ entity information