tm 7.15.

diff --git a/Changes-7.14-7.15.en b/Changes-7.14-7.15.en
new file mode 100644 (file)
index 0000000..b5db47c
--- /dev/null
+++ b/Changes-7.14-7.15.en
@@ -0,0 +1,34 @@
+* tm
+
+tm/tm-parse.el
+----------------------------
+revision 5.0
+date: 1995/10/12 14:29:30;  author: morioka;  state: Exp;  lines: +5 -3
+In function `mime/parse-message', a bug about message/rfc822 was
+fixed.
+----------------------------
+
+tm/tm-view.el
+----------------------------
+revision 7.15
+date: 1995/10/13 08:43:49;  author: morioka;  state: Exp;  lines: +14 -9
+Eric Ding <ericding@San-Jose.ate.slb.com> fixed function
+`mime-viewer/x-face-function'.
+----------------------------
+revision 7.14
+date: 1995/10/13 07:19:52;  author: morioka;  state: Exp;  lines: +4 -2
+In function `mime-viewer/display-content', I fixed to decode subject.
+----------------------------
+
+
+* tm/mh-e
+
+tm/mh-e/tm-mh-e.el
+----------------------------
+revision 7.3
+date: 1995/10/13 08:15:17;  author: morioka;  state: Exp;  lines: +20 -4
+According to Eric Ding <ericding@San-Jose.ate.slb.com>'s report, `,'
+problem was fixed.
+
+But it may have problems.
+----------------------------

diff --git a/Changes-7.14-7.15.ja b/Changes-7.14-7.15.ja
new file mode 100644 (file)
index 0000000..ef0fbe7
--- /dev/null
+++ b/Changes-7.14-7.15.ja
@@ -0,0 +1,35 @@
+* tm
+
+tm/tm-parse.el
+----------------------------
+revision 5.0
+date: 1995/10/12 14:29:30;  author: morioka;  state: Exp;  lines: +5 -3
+\e$B4X?t\e(B mime/parse-message \e$B$K$*$1$k\e(B message/rfc822 \e$B$N>l9g$NIT6q9g$r=$@5$7\e(B
+\e$B$?!#\e(B
+----------------------------
+
+tm/tm-view.el
+----------------------------
+revision 7.15
+date: 1995/10/13 08:43:49;  author: morioka;  state: Exp;  lines: +14 -9
+\e$B4X?t\e(B mime-viewer/x-face-function \e$B$K\e(B Eric Ding
+<ericding@San-Jose.ate.slb.com> \e$B$5$s$N=$@5$r9T$C$?!#\e(B
+----------------------------
+revision 7.14
+date: 1995/10/13 07:19:52;  author: morioka;  state: Exp;  lines: +4 -2
+\e$B4X?t\e(B mime-viewer/display-content \e$B$K$*$$$F!"\e(Bsubject \e$BCf$N\e(B encoded-word
+\e$B$r\e(B decode \e$B$9$k$N$rK:$l$F$$$?$N$r=$@5!#\e(B
+----------------------------
+
+
+* tm/mh-e
+
+tm/mh-e/tm-mh-e.el
+----------------------------
+revision 7.3
+date: 1995/10/13 08:15:17;  author: morioka;  state: Exp;  lines: +20 -4
+Eric Ding <ericding@San-Jose.ate.slb.com> \e$B$5$s$N;XE&$K=>$$!"\e(B`,' \e$B$,8z$+\e(B
+\e$B$J$/$J$C$?LdBj$r=$@5$7$?!#\e(B
+
+\e$BC"$7!"$^$@LdBj$"$j!#\e(B
+----------------------------

diff --git a/Makefile b/Makefile
index aa45c1a..8a9d687 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ TL_FILES = tl/README.eng tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.13.tar
+TARFILE = tm7.15.tar
 
 
 nemacs:

diff --git a/mh-e/Makefile b/mh-e/Makefile
index 3f0c9e1..016f69b 100644 (file)
--- a/mh-e/Makefile
+++ b/mh-e/Makefile
@@ -23,7 +23,7 @@ TMDIR19       = $(HOME)/lib/emacs19/lisp
 
 
 FILES  = tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol
-TARFILE = tm-mh-e7.02.tar
+TARFILE = tm-mh-e7.03.tar
 
 
 elc:

diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el
index 2a2eda9..2d325da 100644 (file)
--- a/mh-e/tm-mh-e.el
+++ b/mh-e/tm-mh-e.el
@@ -26,7 +26,7 @@
 ;;;
 
 (defconst tm-mh-e/RCS-ID
-  "$Id: tm-mh-e.el,v 7.2 1995/10/12 05:43:34 morioka Exp $")
+  "$Id: tm-mh-e.el,v 7.3 1995/10/13 08:15:17 morioka Exp $")
 
 (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID))
 
@@ -41,7 +41,12 @@
 ;;; @ functions
 ;;;
 
-(defun tm-mh-e/display-msg (msg-num folder &optional show-buffer mode)
+(if (not (fboundp 'tm-mh-e/original-mh-display-msg))
+    (fset 'tm-mh-e/original-mh-display-msg
+         (symbol-function 'mh-display-msg))
+  )
+
+(defun mh-display-msg (msg-num folder &optional show-buffer mode)
   (or mode
       (setq mode tm-mh-e/decode-all)
       )
@@ -128,8 +133,6 @@
           (set-buffer folder)
           (setq mh-showing-with-headers nil)))))
 
-(fset 'mh-display-msg (symbol-function 'tm-mh-e/display-msg))
-
 (defun tm-mh-e/view-message (&optional msg)
   "MIME decode and play this message."
   (interactive)
@@ -160,6 +163,18 @@ With arg, turn MIME processing on if arg is positive."
   (mh-show (mh-get-msg-num t))
   )
 
+(defun tm-mh-e/header-display ()
+  (interactive)
+  (if tm-mh-e/decode-all
+      (let ((win (selected-window)))
+       (pop-to-buffer mh-show-buffer)
+       (switch-to-buffer mime::preview/article-buffer)
+       (goto-char (point-min))
+       (select-window win)
+       )
+    (mh-header-display)
+    ))
+
 
 ;;; @ for tm-view
 ;;;
@@ -271,6 +286,7 @@ With arg, turn MIME processing on if arg is positive."
 
 (define-key mh-folder-mode-map "v" (function tm-mh-e/view-message))
 (define-key mh-folder-mode-map "\et" (function tm-mh-e/toggle-decoding-mode))
+(define-key mh-folder-mode-map "," (function tm-mh-e/header-display))
 (define-key mh-folder-mode-map "\r"
   (function (lambda ()
              (interactive)

diff --git a/tm-parse.el b/tm-parse.el
index 88f3e34..3f74127 100644 (file)
--- a/tm-parse.el
+++ b/tm-parse.el
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-parse.el,v 4.0 1995/10/12 06:08:12 morioka Exp $
+;;;    $Id: tm-parse.el,v 5.0 1995/10/12 14:29:30 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -138,7 +138,8 @@ If is is not found, return DEFAULT-ENCODING. [tm-parse.el]"
             )
            ((string= ctype "message/rfc822")
             (goto-char (point-min))
-            (mime::content-info/create rcnum (point-min) (point-max)
+            (mime::content-info/create rcnum
+                                       (point-min) (point-max)
                                        ctype params encoding
                                        (save-restriction
                                          (narrow-to-region
@@ -147,7 +148,8 @@ If is is not found, return DEFAULT-ENCODING. [tm-parse.el]"
                                             (point-min)
                                             )
                                           (point-max))
-                                         (list (mime/parse-message))
+                                         (list (mime/parse-message
+                                                nil nil (cons 0 rcnum)))
                                          )
                                        )
             )

diff --git a/tm-view.el b/tm-view.el
index c9f513e..8d17373 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -25,7 +25,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.13 1995/10/12 06:10:04 morioka Exp $")
+  "$Id: tm-view.el,v 7.15 1995/10/13 08:43:49 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -278,14 +278,19 @@ The compressed face will be piped to this command.")
 
 (defun mime-viewer/x-face-function ()
   "Function to display X-Face field. You can redefine to customize."
-  (goto-char (point-min))
-  (if (re-search-forward "^X-Face:[ \t]*" nil t)
-      (let ((beg (match-end 0))
-           (end (rfc822/field-end))
-           )
-       (call-process-region beg end "sh" nil 0 nil
-                            "-c" mime-viewer/x-face-command)
-       )))
+  ;; 1995/10/12 (c.f. tm-eng:130)
+  ;;   fixed by Eric Ding <ericding@San-Jose.ate.slb.com>
+  (save-restriction
+    (narrow-to-region (point-min) (re-search-forward "^$" nil t))
+    ;; end
+    (goto-char (point-min))
+    (if (re-search-forward "^X-Face:[ \t]*" nil t)
+       (let ((beg (match-end 0))
+             (end (rfc822/field-end))
+             )
+         (call-process-region beg end "sh" nil 0 nil
+                              "-c" mime-viewer/x-face-command)
+         ))))
 
 
 ;;; @ data structures
@@ -374,7 +379,9 @@ The compressed face will be piped to this command.")
       )
     (save-restriction
       (narrow-to-region beg end)
-      (setq subj (mime-viewer/get-subject params encoding))
+      (setq subj
+           (mime/decode-encoded-words-string
+            (mime-viewer/get-subject params encoding)))
       )
     (set-buffer obuf)
     (setq nb (point))