Sync up with the latest semi-1_10.

diff --git a/ChangeLog b/ChangeLog
index 3236be8..d0e441f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-10-22  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el, mime-view.el: Use `(featurep 'xemacs)' instead of
+       `running-xemacs'.
+
 1998-10-22  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * semi-def.el: Add autoload setting for `wid-edit.el'.

diff --git a/mime-edit.el b/mime-edit.el
index b07cf72..2187b32 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -764,7 +764,7 @@ Tspecials means any character that matches with it in header must be quoted.")
     )
   "MIME-edit menubar entry.")
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        ;; modified by Pekka Marjola <pema@iki.fi>
        ;;      1995/9/5 (c.f. [tm-en:69])
        (defun mime-edit-define-menu-for-xemacs ()
@@ -962,7 +962,7 @@ User customizable variables (not documented all of them):
       )))
 
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        (add-minor-mode 'mime-edit-mode-flag
                       '((" MIME-Edit "  mime-transfer-level-string))
                       mime-edit-mode-map
@@ -994,7 +994,7 @@ User customizable variables (not documented all of them):
     (force-mode-line-update)
 
     ;; Define menu for XEmacs.
-    (if running-xemacs
+    (if (featurep 'xemacs)
        (mime-edit-define-menu-for-xemacs)
       )
 
@@ -1032,7 +1032,7 @@ just return to previous mode."
          (mime-edit-translate-buffer)))
     ;; Restore previous state.
     (setq mime-edit-mode-flag nil)
-    (if (and running-xemacs
+    (if (and (featurep 'xemacs)
             (featurep 'menubar))
        (delete-menu-item (list mime-edit-menu-title))
       )

diff --git a/mime-view.el b/mime-view.el
index ea5c815..719f226 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -761,7 +761,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
     )
   "Menu for MIME Viewer")
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        (defvar mime-view-xemacs-popup-menu
         (cons mime-view-menu-title
               (mapcar (function
@@ -831,7 +831,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
     (define-key mime-view-mode-map
       [backspace] (function mime-preview-scroll-down-entity))
     (if (functionp default)
-       (cond (running-xemacs
+       (cond ((featurep 'xemacs)
               (set-keymap-default-binding mime-view-mode-map default)
               )
              (t
@@ -842,7 +842,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
        (define-key mime-view-mode-map
          mouse-button-2 (function mime-button-dispatcher))
       )
-    (cond (running-xemacs
+    (cond ((featurep 'xemacs)
           (define-key mime-view-mode-map
             mouse-button-3 (function mime-view-xemacs-popup-menu))
           )