X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Ftm.git;a=blobdiff_plain;f=tm-mail.el;h=b9cae544611e819c6f391240bfb76eb34c08de16;hp=699d9848718328040c809cdc3f0d6a28a49518eb;hb=d1f12c89ac3491cdbbba0e24173e9b31f79ba73a;hpb=aeca2910477d53331550ef6ce5e937d2c000f2ec

diff --git a/tm-mail.el b/tm-mail.el
index 699d984..b9cae54 100644
--- a/tm-mail.el
+++ b/tm-mail.el
@@ -1,13 +1,14 @@
 ;;;
 ;;; tm-mail.el --- mail-mode extension.
 ;;;
-;;; Copyright (C) 1995 KOBAYASHI Shuhei
+;;; 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>
-;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;;         and Neal Becker <neal@neal.ctd.comsat.com>
+;;; Maintainer: KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
 ;;; Created: 1995/11/27
-;;; Version: $Id: tm-mail.el,v 2.0 1995/12/15 13:53:55 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).
@@ -60,14 +61,23 @@
       ))
     ))
 
-(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)
-    (setq mail-mode-menu
-	  (append mail-mode-menu
-		  (list "---"
-			mime-editor/popup-menu-for-xemacs)))
+(if (and running-xemacs tm-mail/use-xemacs-popup-menu)
+    (cond 
+     ((string-match "19.14" emacs-version)
+      (setq mail-menubar-menu
+	    (append mail-menubar-menu
+		    (list "---"
+			  mime-editor/popup-menu-for-xemacs)))
+      )
+     (t
+      (setq mail-mode-menu
+	    (append mail-mode-menu
+		    (list "---"
+			  mime-editor/popup-menu-for-xemacs)))
+      )
+     )
   )
 
 
@@ -75,3 +85,5 @@
 ;;;
 
 (provide 'tm-mail)
+
+;;; tm-mail.el ends here