tm 7.80.

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

diff --git a/tm-def.el b/tm-def.el
index 821ca71..d8688aa 100644 (file)
--- 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.13 1996/01/25 02:31:19 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,57 +56,46 @@
 (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)
-    ))
-
-(defun mime/find-charset-region (beg end)
-  (mime/find-charset (cons lc-ascii (find-charset-region beg end)))
-  )
-
-(defvar mime/charset-default-encoding-alist
-  '(("US-ASCII"       . nil)
-    ("ISO-8859-1"     . "quoted-printable")
-    ("ISO-8859-2"     . "quoted-printable")
-    ("ISO-8859-3"     . "quoted-printable")
-    ("ISO-8859-4"     . "quoted-printable")
-;;; ("ISO-8859-5"     . "quoted-printable")
-    ("KOI8-R"         . "quoted-printable")
-    ("ISO-8859-7"     . "quoted-printable")
-    ("ISO-8859-8"     . "quoted-printable")
-    ("ISO-8859-9"     . "quoted-printable")
-    ("ISO-2022-JP"    . nil)
-    ("ISO-2022-KR"    . nil)
-    ("EUC-KR"         . nil)
-    ("ISO-2022-JP-2"  . nil)
-    ("ISO-2022-INT-1" . nil)
+(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")
     ))
 
-
-;;; @ coding-system
-;;;
-
-(defvar mime/default-coding-system *ctext*)
+(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  (upcase (symbol-name (car charset-type))))
+                  (type     (nth 1 charset-type))
+                  (encoding (nth 2 charset-type))
+                  )
+              (if (<= type transfer-level)
+                  (cons charset (mime/encoding-name type))
+                (cons charset encoding)
+                ))))
+         mime-charset-type-list))
 
 
 ;;; @ button
@@ -134,16 +126,24 @@
 (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
@@ -156,7 +156,9 @@
 
 (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)
       )