X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-def.el;h=d8688aad56d3de6def7c4e122690fd872a92fa00;hb=a71f8bc4a42303963b86c0a604a6cf60dafa7600;hp=997ce045d39c7bfc73cc3088898f7ee7487d992b;hpb=d4c0596bb253e42934ff4887c6ec492460a9e1b0;p=elisp%2Ftm.git

diff --git a/tm-def.el b/tm-def.el
index 997ce04..d8688aa 100644
--- a/tm-def.el
+++ b/tm-def.el
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;	$Id: tm-def.el,v 7.15 1996/02/06 02:43:06 morioka Exp $
+;;;	$Id: tm-def.el,v 7.62 1996/07/18 06:04:28 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, definition
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -45,6 +45,9 @@
     (function find-file)
     ))
 
+(defvar mime/output-buffer-window-is-shared-with-bbdb t
+  "*If t, mime/output-buffer window is shared with BBDB window.")
+
 
 ;;; @ constants
 ;;;
@@ -53,61 +56,38 @@
 (defconst mime/temp-buffer-name " *MIME-temp*")
 
 
-;;; @ for various Emacs variants
-;;;
-
-(cond ((boundp 'MULE)  (require 'tm-mule))
-      ((boundp 'NEMACS)(require 'tm-nemacs))
-      (t               (require 'tm-orig))
-      )
-
-
 ;;; @ charset and encoding
 ;;;
 
-(defun mime/find-charset (lcl)
-  (if lcl
-      (or (cdr (some-element
-		(function
-		 (lambda (elt)
-		   (subsetp lcl (car elt))
-		   ))
-		mime/lc-charset-alist)
-	       )
-	  mime/unknown-charset)
+(defvar mime-charset-type-list
+  '((us-ascii		7 nil)
+    (iso-8859-1		8 "quoted-printable")
+    (iso-8859-2		8 "quoted-printable")
+    (iso-8859-3		8 "quoted-printable")
+    (iso-8859-4		8 "quoted-printable")
+    (iso-8859-5		8 "quoted-printable")
+    (koi8-r		8 "quoted-printable")
+    (iso-8859-7		8 "quoted-printable")
+    (iso-8859-8		8 "quoted-printable")
+    (iso-8859-9		8 "quoted-printable")
+    (iso-2022-jp	7 "base64")
+    (iso-2022-kr	7 "base64")
+    (euc-kr		8 "base64")
+    (big5		8 "base64")
+    (iso-2022-jp-2	7 "base64")
+    (iso-2022-int-1	7 "base64")
     ))
 
-(defun mime/find-charset-region (beg end)
-  (mime/find-charset (cons lc-ascii (find-charset-region beg end)))
-  )
-
-(defvar mime/charset-type-list
-  '(("US-ASCII"       7 nil)
-    ("ISO-8859-1"     8 "quoted-printable")
-    ("ISO-8859-2"     8 "quoted-printable")
-    ("ISO-8859-3"     8 "quoted-printable")
-    ("ISO-8859-4"     8 "quoted-printable")
-    ("ISO-8859-5"     8 "quoted-printable")
-    ("KOI8-R"         8 "quoted-printable")
-    ("ISO-8859-7"     8 "quoted-printable")
-    ("ISO-8859-8"     8 "quoted-printable")
-    ("ISO-8859-9"     8 "quoted-printable")
-    ("ISO-2022-JP"    7 "base64")
-    ("ISO-2022-KR"    7 "base64")
-    ("EUC-KR"         8 "base64")
-    ("ISO-2022-JP-2"  7 "base64")
-    ("ISO-2022-INT-1" 7 "base64")
-    ))
-
-(defun mime/encoding-name (transfer-level)
+(defun mime/encoding-name (transfer-level &optional not-omit)
   (cond ((> transfer-level 8) "binary")
 	((= transfer-level 8) "8bit")
+	(not-omit "7bit")
 	))
 
 (defun mime/make-charset-default-encoding-alist (transfer-level)
   (mapcar (function
 	   (lambda (charset-type)
-	     (let ((charset  (car charset-type))
+	     (let ((charset  (upcase (symbol-name (car charset-type))))
 		   (type     (nth 1 charset-type))
 		   (encoding (nth 2 charset-type))
 		   )
@@ -115,37 +95,7 @@
 		   (cons charset (mime/encoding-name type))
 		 (cons charset encoding)
 		 ))))
-	  mime/charset-type-list))
-
-(defvar mime/default-transfer-level 7
-  "*A number of network transfer level. It should be 7 or 8.")
-
-(defvar mime/charset-default-encoding-alist
-  (mime/make-charset-default-encoding-alist mime/default-transfer-level))
-
-(defun mime/text-toggle-transfer-level (&optional transfer-level)
-  "Toggle transfer-level is 7bit or 8bit through.
-
-Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
-  (interactive)
-  (if (numberp transfer-level)
-      (setq mime/default-transfer-level transfer-level)
-    (if (< mime/default-transfer-level 8)
-	(setq mime/default-transfer-level 8)
-      (setq mime/default-transfer-level 7)
-      ))
-  (setq mime/charset-default-encoding-alist
-	(mime/make-charset-default-encoding-alist
-	 mime/default-transfer-level))
-  (message (format "Current transfer-level is %d bit"
-		   mime/default-transfer-level))
-  )
-
-
-;;; @ coding-system
-;;;
-
-(defvar mime/default-coding-system *ctext*)
+	  mime-charset-type-list))
 
 
 ;;; @ button
@@ -176,16 +126,24 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
 (defun tm:button-dispatcher (event)
   "Select the button under point."
   (interactive "e")
-  (mouse-set-point event)
-  (let ((func (get-text-property (point) 'tm-callback))
-	(data (get-text-property (point) 'tm-data))
-	)
-    (if func
-	(apply func data)
-      (if (fboundp tm:mother-button-dispatcher)
-	  (funcall tm:mother-button-dispatcher event)
-	)
-      )))
+  (let (buf point func data)
+    (save-window-excursion
+      (mouse-set-point event)
+      (setq buf (current-buffer)
+	    point (point)
+	    func (get-text-property (point) 'tm-callback)
+	    data (get-text-property (point) 'tm-data)
+	    )
+      )
+    (save-excursion
+      (set-buffer buf)
+      (goto-char point)
+      (if func
+	  (apply func data)
+	(if (fboundp tm:mother-button-dispatcher)
+	    (funcall tm:mother-button-dispatcher event)
+	  )
+	))))
 
 
 ;;; @ for URL
@@ -198,7 +156,9 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
 
 (defun tm:browse-url (&optional url)
   (if (fboundp browse-url-browser-function)
-      (call-interactively browse-url-browser-function)
+      (if url 
+        (funcall browse-url-browser-function url)
+      (call-interactively browse-url-browser-function))
     (if (fboundp tm:mother-button-dispatcher)
 	(call-interactively tm:mother-button-dispatcher)
       )