X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-view.el;h=e4354b955c854cbd64d940fb0221fbd335cc7b31;hb=2e41d7945ec51f8fb69e900e291805645ec5282d;hp=26836acb330e126b4437c0317b2d34b1fc428b91;hpb=25fdfe7fd7c4fe3bd8b73bbfa38d661a9558582b;p=elisp%2Fsemi.git

diff --git a/mime-view.el b/mime-view.el
index 26836ac..e4354b9 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -27,7 +27,6 @@
 
 ;;; Code:
 
-(require 'emu)
 (require 'mime)
 (require 'semi-def)
 (require 'calist)
@@ -381,13 +380,15 @@ mother-buffer."
 	  (insert "\n;;; "
 		  (file-name-nondirectory file)
 		  " ends here.\n")
-	  (static-cond
-	   ((boundp 'buffer-file-coding-system)
-	    (setq buffer-file-coding-system
-		  mime-situation-examples-file-coding-system))
-	   ((boundp 'file-coding-system)
-	    (setq file-coding-system
-		  mime-situation-examples-file-coding-system)))
+          (setq buffer-file-coding-system
+		mime-situation-examples-file-coding-system)
+          ;; (static-cond
+          ;;  ((boundp 'buffer-file-coding-system)
+          ;;   (setq buffer-file-coding-system
+          ;;         mime-situation-examples-file-coding-system))
+          ;;  ((boundp 'file-coding-system)
+          ;;   (setq file-coding-system
+          ;;         mime-situation-examples-file-coding-system)))
 	  (setq buffer-file-name file)
 	  (save-buffer)))))
 
@@ -1089,6 +1090,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 	 (set-buffer (event-buffer event))
 	 (popup-menu 'mime-view-xemacs-popup-menu))
        (defvar mouse-button-2 'button2)
+       (defvar mouse-button-3 'button3)
        )
       (t
        (defvar mime-view-popup-menu 
@@ -1110,6 +1112,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
                 (commandp func)
                 (funcall func))))
        (defvar mouse-button-2 [mouse-2])
+       (defvar mouse-button-3 [mouse-3])
        ))
 
 (defun mime-view-define-keymap (&optional default)
@@ -1790,12 +1793,15 @@ It calls function registered in variable
       (with-temp-buffer
 	(insert-file-contents file)
 	(setq mime-situation-examples-file-coding-system
-	      (static-cond
-	       ((boundp 'buffer-file-coding-system)
-		(symbol-value 'buffer-file-coding-system))
-	       ((boundp 'file-coding-system)
-		(symbol-value 'file-coding-system))
-	       (t nil)))
+              (and (boundp 'buffer-file-coding-system)
+		   buffer-file-coding-system)
+	      ;; (static-cond
+              ;;  ((boundp 'buffer-file-coding-system)
+              ;;   (symbol-value 'buffer-file-coding-system))
+              ;;  ((boundp 'file-coding-system)
+              ;;   (symbol-value 'file-coding-system))
+              ;;  (t nil))
+	      )
 	(eval-buffer)
 	;; format check
 	(condition-case nil