X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-view.el;h=278c3e4dba9c8396ea5dd5e44a3ce2aab4f249a4;hb=513cade23e811d0f6ee8db55cc829a20d0261ab0;hp=319b1094888811111022e27da7c6ae5cf850de75;hpb=60e5a9a0123ba51968028aad1d4d139498f972f2;p=elisp%2Fsemi.git

diff --git a/mime-view.el b/mime-view.el
index 319b109..278c3e4 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -6,7 +6,7 @@
 ;; Created: 1994/7/13
 ;;	Renamed: 1994/8/31 from tm-body.el
 ;;	Renamed: 1997/02/19 from tm-view.el
-;; Version: $Revision: 0.15 $
+;; Version: $Revision: 0.21 $
 ;; Keywords: MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -29,8 +29,6 @@
 ;;; Code:
 
 (require 'cl)
-(require 'tl-atype)
-(require 'tl-misc)
 (require 'std11)
 (require 'mel)
 (require 'eword-decode)
@@ -42,7 +40,7 @@
 ;;;
 
 (defconst mime-view-RCS-ID
-  "$Id: mime-view.el,v 0.15 1997-02-24 09:09:55 tmorioka Exp $")
+  "$Id: mime-view.el,v 0.21 1997-03-03 21:22:36 morioka Exp $")
 
 (defconst mime-view-version (get-version-string mime-view-RCS-ID))
 
@@ -247,8 +245,8 @@ Each elements are regexp of field-name. [mime-view.el]")
 	       (if server
 		   (insert (format "[%s %s ([%s] %s)]\n" num subj
 				   access-type (cdr server)))
-		 (let ((site (assoc-value "site" params))
-		       (dir (assoc-value "directory" params))
+		 (let ((site (cdr (assoc "site" params)))
+		       (dir (cdr (assoc "directory" params)))
 		       )
 		   (insert (format "[%s %s ([%s] %s:%s)]\n" num subj
 				   access-type site dir))
@@ -270,8 +268,8 @@ Each elements are regexp of field-name. [mime-view.el]")
 		 )
 	       (insert rest)
 	       ))))
-    (tm:add-button (point-min)(1- (point-max))
-		   (function mime-view-play-content))
+    (mime-add-button (point-min)(1- (point-max))
+		     (function mime-view-play-content))
     ))
 
 (defun mime-preview/default-content-button-function
@@ -579,8 +577,8 @@ The compressed face will be piped to this command.")
     (let ((be (point-max)))
       (narrow-to-region be be)
       (insert mime-view-announcement-for-message/partial)
-      (tm:add-button (point-min)(point-max)
-		     (function mime-view-play-content))
+      (mime-add-button (point-min)(point-max)
+		       (function mime-view-play-content))
       )))
 
 (defun mime-article/get-uu-filename (param &optional encoding)
@@ -711,22 +709,25 @@ The compressed face will be piped to this command.")
     )
   "Menu for MIME Viewer")
 
-(if running-xemacs
-    (progn
-      (defvar mime-view-xemacs-popup-menu
-	(cons mime-view-menu-title
-	      (mapcar (function
-		       (lambda (item)
-			 (vector (nth 1 item)(nth 2 item) t)
-			 ))
-		      mime-view-menu-list)))
-      (defun mime-view-xemacs-popup-menu (event)
-	"Popup the menu in the MIME Viewer buffer"
-	(interactive "e")
-	(select-window (event-window event))
-	(set-buffer (event-buffer event))
-	(popup-menu 'mime-view-xemacs-popup-menu))
-      ))
+(cond (running-xemacs
+       (defvar mime-view-xemacs-popup-menu
+	 (cons mime-view-menu-title
+	       (mapcar (function
+			(lambda (item)
+			  (vector (nth 1 item)(nth 2 item) t)
+			  ))
+		       mime-view-menu-list)))
+       (defun mime-view-xemacs-popup-menu (event)
+	 "Popup the menu in the MIME Viewer buffer"
+	 (interactive "e")
+	 (select-window (event-window event))
+	 (set-buffer (event-buffer event))
+	 (popup-menu 'mime-view-xemacs-popup-menu))
+       (defvar mouse-button-2 'button2)
+       )
+      (t
+       (defvar mouse-button-2 [mouse-2])
+       ))
 
 (defun mime-view-define-keymap (&optional default)
   (let ((mime-view-mode-map (if (keymapp default)
@@ -779,7 +780,7 @@ The compressed face will be piped to this command.")
 	      ))
     (if mouse-button-2
 	(define-key mime-view-mode-map
-	  mouse-button-2 (function tm:button-dispatcher))
+	  mouse-button-2 (function mime-button-dispatcher))
       )
     (cond (running-xemacs
 	   (define-key mime-view-mode-map