From 97a4d0fb367a9ef62d8ff08c55db71b7a0933848 Mon Sep 17 00:00:00 2001 From: morioka Date: Mon, 2 Mar 1998 13:35:39 +0000 Subject: [PATCH] tm 4.8.2. --- Makefile | 2 +- README-jp.ol | 27 +++++++++++++++ README-jp.tex | 41 ++++++++++++++++++++++ mime-setup.el | 105 +++++++-------------------------------------------------- sc-setup.el | 64 +++++++++++++++++++++++++++++++++++ tm-body.el | 23 ++++++++----- tm-setup.el | 50 +++++++++++++++++++++++++++ 7 files changed, 209 insertions(+), 103 deletions(-) create mode 100644 sc-setup.el create mode 100644 tm-setup.el diff --git a/Makefile b/Makefile index e9d55bf..2eacc1b 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ GOMI = *.aux *.log *.tex $(DVIFILES) *.ps $(UTILS) FILES = *.ol Makefile *.el *.c methods $(TEXFILES) -TARFILE = tm4.8.1.tar +TARFILE = tm4.8.2.tar .SUFFIXES: .ol .tex .dvi .ps diff --git a/README-jp.ol b/README-jp.ol index f416774..037ab83 100644 --- a/README-jp.ol +++ b/README-jp.ol @@ -1,5 +1,18 @@ $B!X(Btm- $B@bL@=q!Y(B +* tm $B$H$O(B + + tm $B$O(B Emacs $B$K(B MIME $B5!G=$rIU2C!&6/2=$9$k$?$a$N(B package $B$G$9!#$3$N(B +package $B$O0J2<$N$b$N$r4^$s$G$$$^$9!#(B + + - tiny-mime MIME header encoder/decoder + - tm-body MIME body player + - tm-gnus MIME extender for GNUS + - tm-mh-e MIME extender for mh-e + +$B$G$9!#(B + + * install $B$N;EJ}(B (1) Makefile $B$N(B bindir $B$r<+J,$N4D6-$K9g$o$;$F=q$-49$($k!#(B @@ -19,6 +32,20 @@ plain2 $B$,(B install $B$5$l$F$$$k>l9g!"(Bmake dvi $B$r9T$J$&$3$H$G(B dvi $B$-$^$9!#(B +* $B%P%0Js9p$N;EJ}(B + + tm $B$N%P%0$r8+$D$1$?$i(B fj.editor.emacs $B$K(B post $B$9$k$+!"(Btm ML + $B$K(B mail $B$rAw$C$F2<$5$$!#(B + + tm ML $B$G$O(B tm $B$N%P%0>pJs$N8r49$d:G?7HG$NG[I[!"(Btm $B$N2~NI$K4X$9$k5DO@(B +$B$r9T$J$C$F$$$^$9!#(Btm ML $B$K;22C$7$?$$J}$O(B + + tm-admin@chamonix.jaist.ac.jp + +$B$^$G(B mail $B$rAw$C$F2<$5$$!#EPO?$O$ \maketitle \medskip +\section{tm ¤È¤Ï} +\medskip +\par +tm ¤Ï Emacs ¤Ë MIME µ¡Ç½¤òÉղᦶ¯²½¤¹¤ë¤¿¤á¤Î package ¤Ç¤¹¡£¤³¤Î +package ¤Ï°Ê²¼¤Î¤â¤Î¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£ +\medskip +{\list{}{\leftmargin=4ex}\item[] +\begin{itemize} +\item tiny-mime MIME header encoder/decoder +\item tm-body MIME body player +\item tm-gnus MIME extender for GNUS +\item tm-mh-e MIME extender for mh-e +\medskip +\end{itemize} +\endlist} +\par +¤Ç¤¹¡£ +\medskip +\medskip + \section{install ¤Î»ÅÊý} \medskip { @@ -42,6 +62,27 @@ plain2 \medskip \medskip +\section{¥Ð¥°Êó¹ð¤Î»ÅÊý} +\medskip +\par +tm ¤Î¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é fj.editor.emacs ¤Ë post ¤¹¤ë¤«¡¢tm ML +$<$tm@chamonix.jaist.ac.jp$>$ ¤Ë mail ¤òÁ÷¤Ã¤Æ²¼¤µ¤¤¡£ +\medskip +\par +tm ML ¤Ç¤Ï tm ¤Î¥Ð¥°¾ðÊó¤Î¸ò´¹¤äºÇ¿·ÈǤÎÇÛÉÛ¡¢tm ¤Î²þÎɤ˴ؤ¹¤ëµÄÏÀ +¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£tm ML ¤Ë»²²Ã¤·¤¿¤¤Êý¤Ï +\medskip +{\list{}{\leftmargin=8ex}\item[] +\par +tm-admin@chamonix.jaist.ac.jp +\endlist} +\medskip +\par +¤Þ¤Ç mail ¤òÁ÷¤Ã¤Æ²¼¤µ¤¤¡£ÅÐÏ¿¤Ï¼êÆ°¤Ç¤¹¤Î¤Ç¡¢¤Ç¤­¤ì¤Ð¡¢¼«Á³¸À¸ì¤Ç½ñ¤¤ +¤Æ²¼¤µ¤¤¡£(\verb+^+\_\verb+^+) +\medskip +\medskip + \section{¤ª¤Þ¤±} \medskip \par diff --git a/mime-setup.el b/mime-setup.el index b007247..74de2bd 100644 --- a/mime-setup.el +++ b/mime-setup.el @@ -1,17 +1,10 @@ ;;; -;;; $Id: mime-setup.el,v 1.14 1994/08/01 05:12:01 morioka Exp $ +;;; $Id: mime-setup.el,v 1.17 1994/08/20 12:06:34 morioka Exp $ ;;; (provide 'mime-setup) - -;;; @ for Emacs 18 -;;; -(if (< (string-to-int emacs-version) 19) - (progn - (require 'tl-18) - (defvar buffer-undo-list nil) - )) +(require 'tm-setup) ;;; @ variables @@ -62,7 +55,7 @@ '("ISO-8859-9" . "Q")) ((memq lc-jp lclist) nil) (t ;Unknown charset. It must be Mule! - '("X-ISO-2022-JP-2" . "B")) + '("ISO-2022-JP-2" . "B")) ))) (setq mime-header-charset-chooser 'mime-header-charset-chooser-for-mule-no-encode-ISO-2022-JP) @@ -142,7 +135,7 @@ ("\\.xbm$" "image" "x-xbm" nil "base64") ("\\.PIC$" "image" "x-pic" nil "base64") ("\\.pic$" "image" "x-pic" nil "base64") - ("\\.tiff$" "image" "x-tiff" nil "base64") + ("\\.tiff$" "image" "tiff" nil "base64") ("\\.au$" "audio" "basic" nil "base64") ("\\.mpg$" "video" "mpeg" nil "base64") ("\\.el$" "application" "octet-stream" nil "7bit") @@ -150,81 +143,20 @@ (".*" nil nil nil nil)) ) -(add-hook 'news-reply-mode-hook (function mime/decode-message-header)) - ;;; @ about SuperCite ;;; (if mime-setup-use-sc - (progn - ;; - ;; SuperCite - ;; - (autoload 'sc-cite-original "sc" nil t) - (setq sc-citation-leader "") - (if (and (boundp 'MULE) MULE) - ;; for MULE - (setq sc-cite-regexp - "\\s *\\([a-zA-Z0-9]\\|\\cj\\)*>+\\s *") - ;; for Nemacs - (setq sc-cite-regexp - "\\s *\\([a-zA-Z0-9]\\|\\cc\\|\\cC\\|\\ch\\|\\cH\\|\\ck\\|\\cK\\)*>+\\s *") - ) - - (defun my-sc-overload-hook () - (require 'sc-oloads) - (sc-overload-functions) - ) - - ;; for all but MH-E - (setq mail-yank-hooks 'sc-cite-original) - - ;; for RMAIL, PCMAIL, GNUS - (add-hook 'mail-setup-hook (function my-sc-overload-hook)) - - ;; for Gnus - (add-hook 'news-reply-mode-hook (function my-sc-overload-hook)) - (add-hook 'gnews-ready-hook (function my-sc-overload-hook)) - - ;; for mh-e - (add-hook 'mh-letter-mode-hook (function my-sc-overload-hook)) - (setq mh-yank-hooks 'sc-cite-original) ; for MH-E only - - ;; - ;; sc-register - ;; - ;; (setq sc-load-hook - ;; '(lambda () - ;; (require 'sc-register) - ;; (setq sc-rewrite-header-list - ;; (append sc-rewrite-header-list - ;; (list (list 'sc-header-in-Japanese)) - ;; )) - ;; (setq sc-preferred-header-style - ;; (- (length sc-rewrite-header-list) 1)) - ;; )) - (setq sc-preferred-attribution 'registeredname) - )) + (require 'sc-setup) + ) ;;; @ for mh-e ;;; -(add-hook 'mh-folder-mode-hook - (function - (lambda () - (require 'tm-mh-e) - ))) -(if (boundp 'NEMACS) - (add-hook 'mh-letter-mode-hook - (function - (lambda () - (setq kanji-fileio-code 2) - ))) - ) -(add-hook 'mh-letter-mode-hook (function mime/decode-message-header)) (add-hook 'mh-letter-mode-hook (function (lambda () + (mime/decode-message-header) (mime-mode) (make-local-variable 'mail-header-separator) (setq mail-header-separator "--------")) @@ -233,25 +165,12 @@ ;;; @ for GNUS ;;; -(let ((le (function +(add-hook 'news-reply-mode-hook + (function (lambda () - (require 'tm-gnus) + (mime/decode-message-header) + (mime-mode) ))) - ) - (if (boundp 'MULE) - (progn - (add-hook 'gnus-Group-mode-hook (function gnusutil-initialize)) - (add-hook 'gnus-group-mode-hook (function gnusutil-initialize)) - (autoload 'gnusutil-initialize "gnusutil") - (autoload 'gnusutil-add-group "gnusutil") - (add-hook 'gnusutil-initialize-hook le) - ) - (progn - (add-hook 'gnus-Startup-hook le) - (add-hook 'gnus-startup-hook le) - ))) - -(add-hook 'news-reply-mode-hook (function mime-mode)) (setq gnus-signature-file nil) @@ -259,7 +178,7 @@ ;;; (autoload 'rmail-show-mime "rmailmime" "Show MIME messages." t) (autoload 'rmail-convert-mime-header "rmailmime" "Convert MIME header." nil) -(setq rmail-message-filter 'mime/decode-message-header) +(setq rmail-message-filter (function mime/decode-message-header)) (add-hook 'rmail-mode-hook (function (lambda () diff --git a/sc-setup.el b/sc-setup.el new file mode 100644 index 0000000..c191963 --- /dev/null +++ b/sc-setup.el @@ -0,0 +1,64 @@ +;;; +;;; $Id: sc-setup.el,v 1.2 1994/08/20 12:12:59 morioka Exp $ +;;; + +(provide 'sc-setup) + + +;;; @ for Emacs 18 +;;; +(if (not (fboundp 'add-hook)) + (require 'tl-18) + ) + + +;;; @ for Super Cite +;;; +(autoload 'sc-cite-original "sc" nil t) +(setq sc-citation-leader "") +(cond ((boundp 'MULE) + ;; for MULE + (setq sc-cite-regexp "\\s *\\([a-zA-Z0-9]\\|\\cj\\)*>+\\s *") + ) + ((boundp 'NEMACS) + ;; for Nemacs + (setq sc-cite-regexp + "\\s *\\([a-zA-Z0-9]\\|\\cc\\|\\cC\\|\\ch\\|\\cH\\|\\ck\\|\\cK\\)*>+\\s *") + )) +(defun my-sc-overload-hook () + (require 'sc-oloads) + (sc-overload-functions) + ) + +;;; @@ for all but mh-e +;;; +(setq mail-yank-hooks (function sc-cite-original)) + +;;; @@ for RMAIL, PCMAIL, GNUS +;;; +(add-hook 'mail-setup-hook (function my-sc-overload-hook)) + +;;; @@ for Gnus +;;; +(add-hook 'news-reply-mode-hook (function my-sc-overload-hook)) +(add-hook 'gnews-ready-hook (function my-sc-overload-hook)) + +;;; @@ for mh-e +;;; +(add-hook 'mh-letter-mode-hook (function my-sc-overload-hook)) +(setq mh-yank-hooks 'sc-cite-original) ; for MH-E only + + +;;; @ for sc-register +;;; +;; (setq sc-load-hook +;; '(lambda () +;; (require 'sc-register) +;; (setq sc-rewrite-header-list +;; (append sc-rewrite-header-list +;; (list (list 'sc-header-in-Japanese)) +;; )) +;; (setq sc-preferred-header-style +;; (- (length sc-rewrite-header-list) 1)) +;; )) +(setq sc-preferred-attribution 'registeredname) diff --git a/tm-body.el b/tm-body.el index 102b4e6..ad1d61d 100644 --- a/tm-body.el +++ b/tm-body.el @@ -1,5 +1,5 @@ ;;; -;;; $Id: tm-body.el,v 0.15 1994/08/05 01:49:35 morioka Exp $ +;;; $Id: tm-body.el,v 0.16 1994/08/20 12:38:07 morioka Exp $ ;;; (provide 'tm-body) @@ -100,7 +100,8 @@ default-encoding)) (mime/decode-content boundary (car ctype) encoding - (mime/get-name ctype)) + (mime/get-name ctype boundary) + ) ) ))) @@ -170,13 +171,6 @@ (kill-buffer "FULL") )) )) - -(defun mime/get-name (ctype) - (replace-as-filename - (or (cdr (assoc "name" (cdr ctype))) - (cdr (assoc "x-name" (cdr ctype))) - (message/get-field-body "Content-Description") - ""))) (defun mime/narrow-to-content (boundary) (if boundary @@ -189,6 +183,17 @@ (goto-char (point-min)) ))) +(defun mime/get-name (ctype &optional boundary) + (save-excursion + (save-restriction + (mime/narrow-to-content boundary) + (replace-as-filename + (or (cdr (assoc "name" (cdr ctype))) + (cdr (assoc "x-name" (cdr ctype))) + (message/get-field-body "Content-Description") + "")) + ))) + (defun mime/Content-Type (&optional boundary) (save-excursion (save-restriction diff --git a/tm-setup.el b/tm-setup.el new file mode 100644 index 0000000..e6eea64 --- /dev/null +++ b/tm-setup.el @@ -0,0 +1,50 @@ +;;; +;;; $Id: tm-setup.el,v 1.2 1994/08/20 12:07:45 morioka Exp $ +;;; + +(provide 'tm-setup) + + +;;; @ for Emacs 18 +;;; +(if (< (string-to-int emacs-version) 19) + (progn + (require 'tl-18) + (defvar buffer-undo-list nil) + )) + + +;;; @ for mh-e +;;; +(add-hook 'mh-folder-mode-hook + (function + (lambda () + (require 'tm-mh-e) + ))) + + +;;; @ for GNUS +;;; +(let ((le (function + (lambda () + (require 'tm-gnus) + ))) + ) + (if (boundp 'MULE) + (progn + (add-hook 'gnus-Group-mode-hook (function gnusutil-initialize)) + (add-hook 'gnus-group-mode-hook (function gnusutil-initialize)) + (autoload 'gnusutil-initialize "gnusutil") + (autoload 'gnusutil-add-group "gnusutil") + (add-hook 'gnusutil-initialize-hook le) + ) + (progn + (add-hook 'gnus-Startup-hook le) + (add-hook 'gnus-startup-hook le) + ))) + +;;; Local Variables: +;;; mode: emacs-lisp +;;; mode: outline-minor +;;; outline-regexp: ";;; @+\\|(......" +;;; End: -- 1.7.10.4