From 463ad51a3180796619ebc6fa69128afd2686429b Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 2 Mar 1998 13:49:18 +0000 Subject: [PATCH] tm 5.12 --- Makefile | 2 +- tiny-mime.el | 34 ++++++++++++++----------- tl-str.el | 80 +++++++++++++++++++++++++++++++++++++++++++--------------- tm-comp.el | 7 ++--- tm-gnus.el | 15 +++++++++-- tm-mh-e.el | 19 +++++++------- tm-misc.el | 22 +++------------- tm-rmail.el | 4 +-- tm-view.el | 26 ++++++++----------- 9 files changed, 121 insertions(+), 88 deletions(-) diff --git a/Makefile b/Makefile index a4d88ed..496b2c3 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ GOMI = $(UTILS) FILES = README.eng Makefile *.el *.c methods \ doc/Makefile doc/*.pln doc/*.ol doc/*.tex -TARFILE = tm5.9.1.tar +TARFILE = tm5.12.tar all: $(UTILS) $(DVI) diff --git a/tiny-mime.el b/tiny-mime.el index 6bf81df..6093b37 100644 --- a/tiny-mime.el +++ b/tiny-mime.el @@ -1,27 +1,31 @@ -;; -;; A multilingual MIME message header encoder/decoder. -;; by Morioka Tomohiko (morioka@jaist.ac.jp) -;; -;; original MIME decoder is -;; mime.el,v 1.5 1992/07/18 07:52:08 by Enami Tsugutomo -;; +;;; +;;; A multilingual MIME message header encoder/decoder. +;;; by Morioka Tomohiko (morioka@jaist.ac.jp) +;;; +;;; original MIME decoder is +;;; mime.el,v 1.5 1992/07/18 07:52:08 by Enami Tsugutomo +;;; (provide 'tiny-mime) -(defconst mime/RCS-ID - "$Id: tiny-mime.el,v 4.8 1994/08/11 14:43:54 morioka Exp $") - -(defconst mime/tiny-mime-version - (and (string-match "[0-9][0-9.]*" mime/RCS-ID) - (substring mime/RCS-ID (match-beginning 0)(match-end 0)) - )) +;;; @ require modules +;;; (require 'tl-header) - +(require 'tl-str) (if (not (fboundp 'member)) (require 'tl-18) ) + +;;; @ version +;;; +(defconst mime/RCS-ID + "$Id: tiny-mime.el,v 5.1 1994/10/17 07:40:33 morioka Exp $") + +(defconst mime/tiny-mime-version (get-version-string mime/RCS-ID)) + + ;;; @ MIME encoded-word definition ;;; diff --git a/tl-str.el b/tl-str.el index 3d55598..5d38226 100644 --- a/tl-str.el +++ b/tl-str.el @@ -1,9 +1,64 @@ ;;; -;;; $Id: tl-str.el,v 1.7 1994/09/25 21:33:52 morioka Exp $ +;;; $Id: tl-str.el,v 3.0 1994/10/17 07:16:25 morioka Exp $ ;;; (provide 'tl-str) + +;;; @@ about rightful dividing for multi-octet string +;;; +;; by mol. 1993/9/26 +(defun rightful-boundary-short-string (str width) + (substring str 0 + (let ((i 0) (w 0) chr (len (length str))) + (catch 'label + (while (< i len) + (setq chr (elt str i)) + (setq w (+ w (char-width chr))) + (if (> w width) + (throw 'label i)) + (setq i (+ i (char-bytes chr))) + ) + i)) + )) + + +;;; @@ RCS version +;;; + +(defun get-version-string (id) + (and (string-match "[0-9][0-9.]*" id) + (substring id (match-beginning 0)(match-end 0)) + )) + + +;;; @@ file name +;;; +(defun replace-as-filename (str) + (let ((dest "") + (i 0)(len (length str)) + chr) + (while (< i len) + (setq chr (elt str i)) + (if (or (and (<= ?+ chr)(<= chr ?.)) + (and (<= ?0 chr)(<= chr ?:)) + (= chr ?=) + (and (<= ?@ chr)(<= chr ?\[)) + (and (<= ?\] chr)(<= chr ?_)) + (and (<= ?a chr)(<= chr ?{)) + (and (<= ?} chr)(<= chr ?~)) + ) + (setq dest (concat dest + (char-to-string chr))) + ) + (setq i (+ i 1)) + ) + dest)) + + +;;; @@ message editing utilities +;;; + (defun fill-cited-region (beg end) (interactive "*r") (save-excursion @@ -43,26 +98,9 @@ (replace-match new) )) -(defun replace-as-filename (str) - (let ((dest "") - (i 0)(len (length str)) - chr) - (while (< i len) - (setq chr (elt str i)) - (if (or (and (<= ?+ chr)(<= chr ?.)) - (and (<= ?0 chr)(<= chr ?:)) - (= chr ?=) - (and (<= ?@ chr)(<= chr ?\[)) - (and (<= ?\] chr)(<= chr ?_)) - (and (<= ?a chr)(<= chr ?{)) - (and (<= ?} chr)(<= chr ?~)) - ) - (setq dest (concat dest - (char-to-string chr))) - ) - (setq i (+ i 1)) - ) - dest)) + +;;; @@ jinn compatible functions +;;; (defun symbol-concat (a b) (intern (concat diff --git a/tm-comp.el b/tm-comp.el index 9749f8a..39f3c81 100644 --- a/tm-comp.el +++ b/tm-comp.el @@ -1,14 +1,14 @@ ;;; -;;; $Id: tm-comp.el,v 1.2 1994/09/26 12:37:03 morioka Exp $ +;;; $Id: tm-comp.el,v 2.0 1994/10/17 06:55:56 morioka Exp $ ;;; (provide 'tm-comp) +(require 'tm-misc) (require 'tl-header) (require 'mail-utils) -(defvar mime/tmp-dir (or (getenv "TM_TMPDIR") "/tmp/")) - (defvar mime/message-max-length 1000) + (defvar mime/message-sender-alist '((mail-mode . sendmail-send-it) (mh-letter-mode . (lambda () @@ -20,6 +20,7 @@ )) (news-reply-mode . gnus-inews-article) )) + (defvar mime/window-config-alist '((mail-mode . nil) (mh-letter-mode . mh-previous-window-config) diff --git a/tm-gnus.el b/tm-gnus.el index ac15c58..bdadec2 100644 --- a/tm-gnus.el +++ b/tm-gnus.el @@ -1,16 +1,27 @@ ;;; -;;; $Id: tm-gnus.el,v 3.0 1994/08/28 16:22:16 morioka Exp $ -;;; ;;; A MIME extension for GNUS ;;; ;;; by Morioka Tomohiko, 1993/11/20 +;;; (provide 'tm-gnus) + +;;; @ require modules +;;; (require 'tm-misc) +(require 'tl-str) (require 'gnus) +;;; @ version +;;; +(defconst tm-gnus/RCS-ID + "$Id: tm-gnus.el,v 5.0 1994/10/17 07:18:44 morioka Exp $") + +(defconst tm-gnus/version (get-version-string tm-gnus/RCS-ID)) + + ;;; @ variables ;;; (defvar tm-gnus/startup-hook nil) diff --git a/tm-mh-e.el b/tm-mh-e.el index 96210e3..36230c3 100644 --- a/tm-mh-e.el +++ b/tm-mh-e.el @@ -6,19 +6,10 @@ (provide 'tm-mh-e) -;;; @ version -;;; -(defconst tm-mh-e/RCS-ID - "$Id: tm-mh-e.el,v 5.0 1994/09/25 21:28:29 morioka Exp $") - -(defconst tm-mh-e/version - (and (string-match "[0-9][0-9.]*" tm-mh-e/RCS-ID) - (substring tm-mh-e/RCS-ID (match-beginning 0)(match-end 0)) - )) - ;;; @ require modules ;;; +(require 'tl-str) (require 'tm-misc) (require 'mh-e) (if (not (boundp 'mh-e-version)) @@ -27,6 +18,14 @@ (autoload 'mime/viewer-mode "tm-view" "View MIME message." t) +;;; @ version +;;; +(defconst tm-mh-e/RCS-ID + "$Id: tm-mh-e.el,v 5.1 1994/10/17 07:26:36 morioka Exp $") + +(defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID)) + + ;;; @ MIME header decoding mode ;;; (defun tm-mh-e/toggle-header-decoding-mode (arg) diff --git a/tm-misc.el b/tm-misc.el index 1be7b4b..51fb4b5 100644 --- a/tm-misc.el +++ b/tm-misc.el @@ -1,5 +1,5 @@ ;;; -;;; $Id: tm-misc.el,v 3.0 1994/08/31 07:15:08 morioka Exp $ +;;; $Id: tm-misc.el,v 5.0 1994/10/17 06:55:23 morioka Exp $ ;;; ;;; MIME utility for tm-*.el MIME user agent packages ;;; @@ -12,6 +12,8 @@ ) (require 'tiny-mime) +(defvar mime/tmp-dir (or (getenv "TM_TMPDIR") "/tmp/")) + (defvar mime/header-decoding-mode t "*Decode MIME header if non-nil.") (defun mime/add-header-decoding-mode-to-mode-line () @@ -22,24 +24,6 @@ )) -;;; @ about rightful dividing for multi-octet string -;;; -;; by mol. 1993/9/26 -(defun rightful-boundary-short-string (str width) - (substring str 0 - (let ((i 0) (w 0) chr (len (length str))) - (catch 'label - (while (< i len) - (setq chr (elt str i)) - (setq w (+ w (char-width chr))) - (if (> w width) - (throw 'label i)) - (setq i (+ i (char-bytes chr))) - ) - i)) - )) - - ;;; @ functions to check field ;;; (defun mime/exist-encoded-word-in-subject () diff --git a/tm-rmail.el b/tm-rmail.el index 49aaf83..d1e1d76 100644 --- a/tm-rmail.el +++ b/tm-rmail.el @@ -1,5 +1,5 @@ ;;; -;;; $Id: tm-rmail.el,v 5.0 1994/09/25 21:26:05 morioka Exp $ +;;; $Id: tm-rmail.el,v 5.1 1994/10/17 06:31:29 morioka Exp $ ;;; (provide 'tm-rmail) @@ -22,7 +22,7 @@ (add-hook 'rmail-mode-hook (function (lambda () - (local-set-key "v" 'mime/view-mode) + (local-set-key "v" 'mime/viewer-mode) ))) (add-hook 'rmail-summary-mode-hook diff --git a/tm-view.el b/tm-view.el index 64b4019..99e8446 100644 --- a/tm-view.el +++ b/tm-view.el @@ -6,18 +6,6 @@ (provide 'tm-view) -;;; @ version -;;; - -(defconst mime/viewer-RCS-ID - "$Id: tm-view.el,v 5.9 1994/10/11 15:14:07 morioka Exp $") - -(defconst mime/viewer-version - (and (string-match "[0-9][0-9.]*" mime/viewer-RCS-ID) - (substring mime/viewer-RCS-ID (match-beginning 0)(match-end 0)) - )) - - ;;; @ require modules ;;; @@ -25,6 +13,16 @@ (require 'tl-list) (require 'tl-header) (require 'tiny-mime) +(require 'tm-misc) + + +;;; @ version +;;; + +(defconst mime/viewer-RCS-ID + "$Id: tm-view.el,v 5.12 1994/10/17 07:28:34 morioka Exp $") + +(defconst mime/viewer-version (get-version-string mime/viewer-RCS-ID)) ;;; @ constants @@ -157,8 +155,6 @@ ))) )) -(defvar mime/tmp-dir "/tmp/") - (defvar mime/use-internal-decoder nil) (defvar mime/body-decoding-mode "play" "MIME body decoding mode") @@ -333,7 +329,7 @@ (switch-to-buffer obuf) (erase-buffer) )) - (let ((r fcl) cell cid ctype beg end e nb ne subj dest) + (let ((r fcl) cell cid ctype beg end e nb ne subj dest str) (while r (setq cell (car r)) (setq beg (car cell)) -- 1.7.10.4