X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-def.el;h=d8688aad56d3de6def7c4e122690fd872a92fa00;hb=29e661110079bf0d047d34fa64f7a963d06b7522;hp=d554a8bf837f033cd11306fd90175dbdd4af74e9;hpb=a5ffa065614536ca388988f44c80bebcca51a483;p=elisp%2Ftm.git diff --git a/tm-def.el b/tm-def.el index d554a8b..d8688aa 100644 --- a/tm-def.el +++ b/tm-def.el @@ -6,7 +6,7 @@ ;;; ;;; Author: MORIOKA Tomohiko ;;; Version: -;;; $Id: tm-def.el,v 7.36 1996/04/27 15:30:29 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,91 +56,26 @@ (defconst mime/temp-buffer-name " *MIME-temp*") -;;; @ leading-character and charset -;;; - -(defvar mime/lc-charset-alist - (foldr (function - (lambda (a cell) - (or (catch 'tag - (cons (cons (foldr (function - (lambda (a sym) - (if (boundp sym) - (cons (symbol-value sym) a) - (throw 'tag nil) - ))) - nil - (car cell)) - (cdr cell)) - a)) - a) - )) - nil - '(((lc-ascii) . "US-ASCII") - ((lc-ascii lc-ltn1) . "ISO-8859-1") - ((lc-ascii lc-ltn2) . "ISO-8859-2") - ((lc-ascii lc-ltn3) . "ISO-8859-3") - ((lc-ascii lc-ltn4) . "ISO-8859-4") -;;; ((lc-ascii lc-crl) . "ISO-8859-5") - ((lc-ascii lc-crl) . "KOI8-R") - ((lc-ascii lc-grk) . "ISO-8859-7") - ((lc-ascii lc-hbw) . "ISO-8859-8") - ((lc-ascii lc-ltn5) . "ISO-8859-9") - ((lc-ascii lc-jp) . "ISO-2022-JP") - ((lc-ascii lc-kr) . "EUC-KR") - ((lc-ascii - lc-big5-1 - lc-big5-2) . "BIG5") - ((lc-ascii - lc-jp lc-cn - lc-kr lc-jp2 - lc-ltn1 lc-grk) . "ISO-2022-JP-2") - ((lc-ascii - lc-jp lc-cn - lc-kr lc-jp2 - lc-cns1 lc-cns2 - lc-ltn1 lc-grk) . "ISO-2022-INT-1") - ))) - -(defvar mime/unknown-charset "ISO-2022-INT-1") - - ;;; @ 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-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") +(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/encoding-name (transfer-level &optional not-omit) @@ -149,7 +87,7 @@ (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)) ) @@ -157,81 +95,7 @@ (cons charset (mime/encoding-name type)) (cons charset encoding) )))) - mime/charset-type-list)) - - -;;; @ coding-system -;;; - -(defvar mime/charset-coding-system-alist - (let* (csl - (f (if (and running-xemacs-20 (featurep 'mule)) - (progn - (setq csl (coding-system-list)) - (function - (lambda (a cell) - (if (memq (cdr cell) csl) - (cons cell a) - a)))) - (function - (lambda (a cell) - (let ((sym (symbol-concat "*" (cdr cell) "*"))) - (if (boundp sym) - (cons (cons (car cell) (symbol-value sym)) a) - a)))) - ))) - (foldr f nil - '(("ISO-2022-JP" . junet) - ("ISO-2022-KR" . iso-2022-kr) - ("EUC-KR" . euc-kr) - ("ISO-8859-1" . ctext) - ("ISO-8859-2" . iso-8859-2) - ("ISO-8859-3" . iso-8859-3) - ("ISO-8859-4" . iso-8859-4) - ("ISO-8859-5" . iso-8859-5) - ("KOI8-R" . koi8) - ("ISO-8859-7" . iso-8859-7) - ("ISO-8859-8" . iso-8859-8) - ("ISO-8859-9" . iso-8859-9) - ("ISO-2022-JP-2" . iso-2022-ss2-7) - ("X-ISO-2022-JP-2" . iso-2022-ss2-7) - ("ISO-2022-INT-1" . iso-2022-int-1) - ("SHIFT_JIS" . sjis) - ("X-SHIFTJIS" . sjis) - ("BIG5" . big5) - )))) - -(defvar mime/default-coding-system *ctext*) - -(defun mime/convert-string-to-emacs (str charset) - (let ((cs (assoc charset mime/charset-coding-system-alist))) - (if cs - (decode-coding-string str (cdr cs)) - ))) - -(defun mime/convert-string-from-emacs (str charset) - (let ((cs (assoc charset mime/charset-coding-system-alist))) - (if cs - (encode-coding-string str (cdr cs)) - ))) - -(defun mime/code-convert-region-to-emacs (beg end charset &optional encoding) - (let ((ct - (if (stringp charset) - (cdr (assoc (upcase charset) mime/charset-coding-system-alist)) - mime/default-coding-system))) - (if ct - (decode-coding-region beg end ct) - ))) - -(defun mime/code-convert-region-from-emacs (beg end charset &optional encoding) - (let ((ct - (if (stringp charset) - (cdr (assoc (upcase charset) mime/charset-coding-system-alist)) - mime/default-coding-system))) - (if ct - (encode-coding-region beg end ct) - ))) + mime-charset-type-list)) ;;; @ button @@ -262,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 @@ -284,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) )