X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-def.el;h=7d341d0639d58244de6ba439608c0b1d2f6351b1;hb=86824724a2d5325e296ee93a1abb3952d2320a20;hp=997ce045d39c7bfc73cc3088898f7ee7487d992b;hpb=d4c0596bb253e42934ff4887c6ec492460a9e1b0;p=elisp%2Ftm.git diff --git a/tm-def.el b/tm-def.el index 997ce04..7d341d0 100644 --- a/tm-def.el +++ b/tm-def.el @@ -1,34 +1,31 @@ -;;; ;;; tm-def.el --- definition module for tm -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1995,1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; Version: -;;; $Id: tm-def.el,v 7.15 1996/02/06 02:43:06 morioka Exp $ -;;; Keywords: mail, news, MIME, multimedia, definition -;;; -;;; This file is part of tm (Tools for MIME). -;;; -;;; This program is free software; you can redistribute it and/or -;;; modify it under the terms of the GNU General Public License as -;;; published by the Free Software Foundation; either version 2, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;;; General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with This program. If not, write to the Free Software -;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -;;; + +;; Copyright (C) 1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; Version: $Id: tm-def.el,v 7.66 1996/11/26 18:00:45 shuhei-k Exp $ +;; Keywords: mail, news, MIME, multimedia, definition + +;; This file is part of tm (Tools for MIME). + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License as +;; published by the Free Software Foundation; either version 2, or (at +;; your option) any later version. + +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. + ;;; Code: (require 'emu) -(require 'tl-822) ;;; @ variables @@ -45,6 +42,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 +53,39 @@ (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") + (gb2312 8 "quoted-printable") + (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 +93,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 +124,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 +154,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) ) @@ -214,10 +172,6 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8." (defconst mime/content-type-subtype-regexp (concat mime/token-regexp "/" mime/token-regexp)) -(defconst mime/content-parameter-value-regexp - (concat "\\(" - rfc822/quoted-string-regexp - "\\|[^; \t\n]*\\)")) (defconst mime/disposition-type-regexp mime/token-regexp) @@ -226,14 +180,21 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8." ;;; (defconst base64-token-regexp "[A-Za-z0-9+/=]") +(defconst base64-token-padding-regexp "[A-Za-z0-9+/=]") (defconst mime/B-encoded-text-regexp - (concat "\\(" + (concat "\\(\\(" + base64-token-regexp base64-token-regexp base64-token-regexp base64-token-regexp + "\\)*" base64-token-regexp - "\\)+")) + base64-token-regexp + base64-token-padding-regexp + base64-token-padding-regexp + "\\)")) + (defconst mime/B-encoding-and-encoded-text-regexp (concat "\\(B\\)\\?" mime/B-encoded-text-regexp))