--- /dev/null
+* tm
+
+ Fixed mk-tm.
+
+tm/tm-view.el
+----------------------------
+revision 6.76
+date: 1995/08/31 15:05:50; author: morioka; state: Exp; lines: +6 -2
+Fixed function `mime-viewer/make-preview-buffer' about using of function
+`mime-viewer/get-subject'.
+----------------------------
+revision 6.75
+date: 1995/08/31 14:10:04; author: morioka; state: Exp; lines: +81 -61
+Show content-subject in body part of preview-buffer for single part
+hidden body message. So separated content-subject inserter from
+function `mime-viewer/default-content-subject-function' to function
+`mime-viewer/insert-content-subject'.
+----------------------------
+
+tm/tm-comp.el
+----------------------------
+revision 6.10
+date: 1995/08/30 05:37:50; author: morioka; state: Exp; lines: +5 -6
+Rewrote regexps of constant `mime/message-nuke-headers' and constant
+`mime/message-blind-headers'.
+----------------------------
+revision 6.9
+date: 1995/08/30 05:01:46; author: morioka; state: Exp; lines: +46 -1
+Defined function `tm-comp::mime-insert-file' to expand parameter
+expression of variable `mime-file-types'.
+----------------------------
+
+
+* tm/gnus
+
+ Attached version 6.17.
+
+ Fixed mk-tgnus.
+
+tm/gnus/tm-dgnus.el
+----------------------------
+revision 6.17
+date: 1995/08/31 05:55:52; author: morioka; state: Exp; lines: +13 -5
+According to Mr.Nishijima <racsho@cpdc.canon.co.jp>'s report,
+measured to (ding) GNUS 0.99.28 changes.
+----------------------------
--- /dev/null
+* tm
+
+ mk-tm \e$B$r=$@5$7$?!#\e(B
+
+tm/tm-view.el
+----------------------------
+revision 6.76
+date: 1995/08/31 15:05:50; author: morioka; state: Exp; lines: +6 -2
+\e$B4X?t\e(B mime-viewer/make-preview-buffer \e$B$K$*$1$k!"4X?t\e(B
+mime-viewer/get-subject \e$B$N;H$$J}$K4X$9$kIT6q9g$r=$@5$7$?!#\e(B
+----------------------------
+revision 6.75
+date: 1995/08/31 14:10:04; author: morioka; state: Exp; lines: +81 -61
+single part \e$B$G\e(B body \e$B$,I=<($5$l$J$$\e(B message \e$B$N\e(B body \e$BIt$K\e(B
+content-subject \e$B$rI=<($9$k$h$&$K$7$?!#$3$N$?$a!"4X?t\e(B
+mime-viewer/default-content-subject-function \e$B$N\e(B content-subject \e$BI=<(It\e(B
+\e$B$r4X?t\e(B mime-viewer/insert-content-subject \e$B$KJ,N%$7$?!#\e(B
+----------------------------
+
+tm/tm-comp.el
+----------------------------
+revision 6.10
+date: 1995/08/30 05:37:50; author: morioka; state: Exp; lines: +5 -6
+\e$BDj?t\e(B mime/message-nuke-headers \e$B$HDj?t\e(B mime/message-blind-headers \e$B$N@5\e(B
+\e$B5,I=8=$r=q$-D>$7$?!#\e(B
+----------------------------
+revision 6.9
+date: 1995/08/30 05:01:46; author: morioka; state: Exp; lines: +46 -1
+\e$B4X?t\e(B tm-comp::mime-insert-file \e$B$rDj5A$7!"JQ?t\e(B mime-file-types \e$B$N\e(B
+parameters \e$B$r3HD%$7$?!#\e(B
+----------------------------
+
+
+* tm/gnus
+
+ Version 6.17 \e$B$rE:IU$7$?!#\e(B
+
+ mk-tgnus \e$B$r=$@5$7$?!#\e(B
+
+tm/gnus/tm-dgnus.el
+----------------------------
+revision 6.17
+date: 1995/08/31 05:55:52; author: morioka; state: Exp; lines: +13 -5
+\e$B@>Eg\e(B \e$B9'FA\e(B <racsho@cpdc.canon.co.jp> \e$B$5$s$N;XE&$K=>$$!"\e(B(ding) GNUS
+0.99.28 \e$B$KBP1~$7$?!#\e(B
+----------------------------
FILES = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
-TARFILE = tm6.74.tar
+TARFILE = tm6.76.tar
nemacs:
[README for tm (English Version)]
by MORIOKA Tomohiko <morioka@jaist.ac.jp>
-$Id: README.eng,v 6.3 1995/08/14 17:46:22 morioka Exp $
+$Id: README.eng,v 6.4 1995/08/31 14:22:04 morioka Exp $
1 What's tm?
If you want to use automatic MIME preview support, please apply a
patch to (ding) GNUS. This patch is called `with tm patch'. It is
available from ftp.jaist.ac.jp:/pub/GNU/elisp/dgnus/. Current version
-is dgnus-0.98.7-tm.diff.
+is dgnus-0.99.23-tm.diff.
5.1 tm-mh-e
FILES = tm/gnus/*.el
-TARFILE = tm-gnus6.16.tar
+TARFILE = tm-gnus6.17.tar
gnus3:
(require 'gnus)
(require 'tm-view)
(princ (format "%s\n" gnus-version))
- (if (string-match "(ding)" gnus-version)
- (byte-compile-file "tm-dgnus.el")
- (if (string-match "GNUS 3" gnus-version)
- (byte-compile-file "tm-gnus3.el")
- (byte-compile-file "tm-gnus4.el")
- ))
+ (cond ((string-match "(ding)" gnus-version)
+ (if (string-lessp "(ding) Gnus v0.99.27" gnus-version)
+ (byte-compile-file "tm-dgnus.el")
+ )
+ )
+ ((string-match "GNUS 3" gnus-version)
+ (byte-compile-file "tm-gnus3.el")
+ )
+ (t
+ (byte-compile-file "tm-gnus4.el")
+ ))
(byte-compile-file "tm-gnus.el")
)
;;; @ version
;;;
(defconst tm-gnus/RCS-ID
- "$Id: tm-dgnus.el,v 6.16 1995/08/30 02:44:11 morioka Exp $")
+ "$Id: tm-dgnus.el,v 6.17 1995/08/31 05:55:52 morioka Exp $")
(defconst tm-gnus/version
(concat (get-version-string tm-gnus/RCS-ID) " (ding)"))
(concat "*Preview-" gnus-clean-article-buffer "*"))
)
+(if (not (fboundp 'mail-header-from))
+ (progn
+ (defalias 'mail-header-from 'header-from)
+ (defalias 'mail-header-set-from 'header-set-from)
+ (defalias 'mail-header-subject 'header-subject)
+ (defalias 'mail-header-set-subject 'header-set-subject)
+ ))
+
;;; @ autoload
;;;
(defun tm-gnus/decode-summary-from-and-subjects ()
(mapcar (function
(lambda (header)
- (header-set-from
+ (mail-header-set-from
header
- (mime/decode-string (or (header-from header) ""))
+ (mime/decode-string (or (mail-header-from header) ""))
)
- (header-set-subject
+ (mail-header-set-subject
header
- (mime/decode-string (or (header-subject header) ""))
+ (mime/decode-string (or (mail-header-subject header) ""))
)
))
gnus-newsgroup-headers)
'("signature"
"tiny-mime" "tm-misc"
"tm-view"
- "tm-ftp" "tm-latex"
+ "tm-latex"
"tm-rmail" "tm-comp"
"tm-setup" "mime-setup"
))
(if (catch 'tag
(let ((paths load-path) path)
(while paths
+ (setq path (expand-file-name "ange-ftp.el" (car paths)))
+ (if (file-exists-p path)
+ (throw 'tag path)
+ )
+ (setq paths (cdr paths))
+ )))
+ (setq tm-modules (append tm-modules '("tm-ftp")))
+ (setq tm-uncompile-el-files
+ (append tm-uncompile-el-files '("tm-ftp.el")))
+ )
+
+(if (catch 'tag
+ (let ((paths load-path) path)
+ (while paths
(setq path (expand-file-name "vm.el" (car paths)))
(if (file-exists-p path)
(throw 'tag path)
;;;
(defconst mime/composer-RCS-ID
- "$Id: tm-comp.el,v 6.8 1995/08/30 00:40:26 morioka Exp $")
+ "$Id: tm-comp.el,v 6.10 1995/08/30 05:37:50 morioka Exp $")
(defconst mime/composer-version (get-version-string mime/composer-RCS-ID))
'((news-reply-mode . 500)))
(defconst mime/message-nuke-headers
- "\\(^[Cc]ontent-\\|^[Ss]ubject:\\|^[Mm][Ii][Mm][Ee]-[Vv]ersion:\\)")
-(defvar mime/message-blind-headers
- "\\(^[BDFbdf][Cc][Cc]:\\|^[Cc][Cc]:[ \t]*$\\)")
+ "\\(^Content-\\|^Subject:\\|^MIME-Version:\\)")
+(defvar mime/message-blind-headers "\\(^[BDFbdf]cc:\\|^cc:[ \t]*$\\)")
(defvar mime/message-default-sender-alist
'((mail-mode . mail-send-and-exit)
;;; @ edit
;;;
+(defun tm-comp::mime-insert-file (file)
+ "Insert a message from a file."
+ (interactive "fInsert file as MIME message: ")
+ (let* ((guess (mime-find-file-type file))
+ (pritype (nth 0 guess))
+ (subtype (nth 1 guess))
+ (parameters (nth 2 guess))
+ (default (nth 3 guess)) ;Guess encoding from its file name.
+ (encoding
+ (if (not (interactive-p))
+ default
+ (completing-read
+ (concat "What transfer encoding"
+ (if default
+ (concat " (default "
+ (if (string-equal default "") "\"\"" default)
+ ")"
+ ))
+ ": ")
+ mime-transfer-encoders nil t nil))))
+ (if (string-equal encoding "")
+ (setq encoding default))
+ (if (consp parameters)
+ (let ((rest parameters) cell attribute value)
+ (setq parameters "")
+ (while rest
+ (setq cell (car rest))
+ (setq attribute (car cell))
+ (setq value (cdr cell))
+ (if (eq value 'file)
+ (setq value (file-name-nondirectory file))
+ )
+ (setq parameters (concat parameters "; " attribute "=" value))
+ (setq rest (cdr rest))
+ )))
+ (mime-insert-tag pritype subtype parameters)
+ (mime-insert-binary-file file encoding)
+ ))
+
;; Insert the binary content after MIME tag.
;; modified by MORITA Masahiro <hiro@isl.ntt.JP>
;; for x-uue
(add-hook 'mime-mode-hook
(function
(lambda ()
+ (if (not (fboundp 'original::mime-insert-file))
+ (progn
+ (fset 'original::mime-insert-file
+ (symbol-function 'mime-insert-file))
+ (fset 'mime-insert-file 'tm-comp::mime-insert-file)
+ ))
(if (not (fboundp 'original::mime-insert-binary-file))
(progn
(fset 'original::mime-insert-binary-file
)
-(run-hooks 'tm-comp-load-hook)
-
(provide 'tm-comp)
+
+(run-hooks 'tm-comp-load-hook)
;;;
(defconst mime-viewer/RCS-ID
- "$Id: tm-view.el,v 6.74 1995/08/27 19:05:58 morioka Exp $")
+ "$Id: tm-view.el,v 6.76 1995/08/31 15:05:50 morioka Exp $")
(defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
(defconst mime/viewer-version mime-viewer/version)
;;; @@ content subject
;;;
+(defun mime-viewer/insert-content-subject
+ (cnum cinfo ctype params subj)
+ (insert
+ (let ((access-type (assoc "access-type" params))
+ (num (or (assoc-value "x-part-number" params)
+ (if (listp cnum)
+ (mapconcat (function
+ (lambda (num)
+ (format "%s" (+ num 1))
+ ))
+ cnum ".")
+ "0"))
+ ))
+ (if access-type
+ (let ((server (assoc "server" params)))
+ (setq access-type (cdr access-type))
+ (if server
+ (format "[%s %s ([%s] %s)]\n" num subj
+ access-type (cdr server))
+ (let ((site (assoc-value "site" params))
+ (dir (assoc-value "directory" params))
+ )
+ (format "[%s %s ([%s] %s:%s)]\n" num subj
+ access-type site dir)
+ )))
+ (format "[%s %s (%s)]\n" num subj ctype)
+ ))))
+
(defun mime-viewer/default-content-subject-function
(cnum cinfo ctype params subj)
(if (and (listp cnum)
ctype
mime-viewer/content-subject-omitting-Content-Type-list))
)
- (insert
- (let ((access-type (assoc "access-type" params))
- (num (or (assoc-value "x-part-number" params)
- (if (listp cnum)
- (mapconcat (function
- (lambda (num)
- (format "%s" (+ num 1))
- ))
- cnum ".")
- "0"))
- ))
- (if access-type
- (let ((server (assoc "server" params)))
- (setq access-type (cdr access-type))
- (if server
- (format "[%s %s ([%s] %s)]\n" num subj
- access-type (cdr server))
- (let ((site (assoc-value "site" params))
- (dir (assoc-value "directory" params))
- )
- (format "[%s %s ([%s] %s:%s)]\n" num subj
- access-type site dir)
- )))
- (format "[%s %s (%s)]\n" num subj ctype)
- )))))
+ (mime-viewer/insert-content-subject
+ cnum cinfo ctype params subj)
+ ))
(defvar mime-viewer/content-subject-function
(function mime-viewer/default-content-subject-function))
(if (> he (point-max))
(setq he (point-max))
)
+ (save-excursion
+ (save-restriction
+ (narrow-to-region beg he)
+ (setq subj (mime-viewer/get-subject params))
+ ))
(switch-to-buffer obuf)
(setq nb (point))
(narrow-to-region nb nb)
(run-hooks 'mime-viewer/content-header-filter-hook)
(switch-to-buffer the-buf)
))
- (if (mime-viewer/body-visible-p cnum cinfo ctype)
- (let (be)
- (setq str (buffer-substring he end))
- (switch-to-buffer obuf)
- (save-restriction
- (setq be (point-max))
- (narrow-to-region be be)
- (insert str)
- (setq ne (point-max))
- (let ((f (or (assoc-value
- ctype
- mime-viewer/content-filter-alist)
- )))
- (if (and f (fboundp f))
- (funcall f ctype params encoding)
- (mime-viewer/default-content-filter
- cnum cinfo ctype params subj)
- ))
- (setq ne (point-max))
- )
- (switch-to-buffer the-buf)
+ (cond ((mime-viewer/body-visible-p cnum cinfo ctype)
+ (let (be)
+ (setq str (buffer-substring he end))
+ (switch-to-buffer obuf)
+ (save-restriction
+ (setq be (point-max))
+ (narrow-to-region be be)
+ (insert str)
+ (setq ne (point-max))
+ (let ((f (or (assoc-value
+ ctype
+ mime-viewer/content-filter-alist)
+ )))
+ (if (and f (fboundp f))
+ (funcall f ctype params encoding)
+ (mime-viewer/default-content-filter
+ cnum cinfo ctype params subj)
+ ))
+ (setq ne (point-max))
+ )
+ (switch-to-buffer the-buf)
+ ))
+ ((equal ctype "message/partial")
+ (let (be)
+ (switch-to-buffer obuf)
+ (save-restriction
+ (setq be (point-max))
+ (narrow-to-region be be)
+ (insert
+ mime-viewer/announcement-for-message/partial)
+ (setq ne (point-max))
+ )
+ (switch-to-buffer the-buf)
+ ))
+ ((and (eq cnum t)
+ (null (mime::content-info/children cinfo))
+ )
+ (let (be)
+ (switch-to-buffer obuf)
+ (save-restriction
+ (setq be (point-max))
+ (narrow-to-region be be)
+ (mime-viewer/insert-content-subject
+ cnum cinfo ctype params subj)
+ (setq ne (point-max))
+ )
+ (switch-to-buffer the-buf)
+ ))
)
- (if (equal ctype "message/partial")
- (let (be)
- (switch-to-buffer obuf)
- (save-restriction
- (setq be (point-max))
- (narrow-to-region be be)
- (insert
- mime-viewer/announcement-for-message/partial)
- (setq ne (point-max))
- )
- (switch-to-buffer the-buf)
- ))
- )
(switch-to-buffer obuf)
(mime-viewer/default-content-separator
cnum cinfo ctype params subj)
(prog1
(progn
- (setq subj (mime-viewer/get-subject params))
(goto-char nb)
(funcall mime-viewer/content-subject-function
cnum cinfo ctype params subj)
projects / elisp / tm.git / commitdiff