tm 7.80.

[elisp/tm.git] / tm-mail.el

diff --git a/tm-mail.el b/tm-mail.el
index 0ef0bf5..b9cae54 100644 (file)
--- a/tm-mail.el
+++ b/tm-mail.el
@@ -3,12 +3,12 @@
 ;;;
 ;;; Copyright (C) 1995,1996 KOBAYASHI Shuhei
 ;;; 
-;;; Author: KOBAYASHI Shuhei <shuhei@cmpt01.phys.tohoku.ac.jp>
+;;; Author: KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
 ;;; modified by MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;;         and Neal Becker <neal@neal.ctd.comsat.com>
-;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Maintainer: KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
 ;;; Created: 1995/11/27
-;;; Version: $Id: tm-mail.el,v 4.0 1996/02/27 10:13:50 morioka Exp $
+;;; Version: $Id: tm-mail.el,v 6.0 1996/04/16 18:24:02 morioka Exp $
 ;;; Keywords: mail, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -61,10 +61,9 @@
       ))
     ))
 
-(defvar tm-mail/use-xemacs-popup-menu t)
+(defvar tm-mail/use-xemacs-popup-menu running-xemacs)
 
-(if (and (string-match "XEmacs\\|Lucid" emacs-version)
-        tm-mail/use-xemacs-popup-menu)
+(if (and running-xemacs tm-mail/use-xemacs-popup-menu)
     (cond 
      ((string-match "19.14" emacs-version)
       (setq mail-menubar-menu