tm 7.63.
authormorioka <morioka>
Mon, 9 Mar 1998 18:45:08 +0000 (18:45 +0000)
committermorioka <morioka>
Mon, 9 Mar 1998 18:45:08 +0000 (18:45 +0000)
12 files changed:
ChangeLog
Makefile
TM-CFG
gnus/ChangeLog
gnus/Makefile
gnus/tm-sgnus.el
inst-tm
mh-e/ChangeLog
mh-e/Makefile
mh-e/tm-mh-e.el
tm-edit.el
tm-view.el

index ede4b94..04d32d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+Mon May 20 16:24:30 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.26 was released.
+       * tm: Version 7.63 was released.
+       * tm/mh-e: Version 7.62 was released.
+       * tm/gnus: Version 7.61 was released.
+
+       * TM-CFG (default-load-path): New variable.
+
+       (PREFIX): default value is got from variable `exec-directory' or
+       `data-directory'.
+
+       Variable `EMACS_PREFIX' and `DATA_PREFIX' were abolished.
+
+       (LISPDIR): default value is searched from variable
+       `default-load-path'.
+
+Mon May 20 14:56:33 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-view.el (mime-viewer/visible-field-list): add "Message-Id".
+
+       (mime-viewer/content-button-ignored-ctype-list): renamed from
+       variable `mime-viewer/content-subject-omitting-Content-Type-list'.
+
+       (mime-viewer/content-button-visible-ctype-list): renamed from
+       variable `mime-viewer/content-subject-showing-Content-Type-list'.
+
+       (mime-preview/insert-content-button): renamed from function
+       `mime-preview/insert-content-subject'.
+
+       (mime-preview/default-content-button-function): renamed from
+       function `mime-preview/default-content-subject-function'.
+
+       (mime-preview/content-button-function): renamed from variable
+       `mime-preview/content-subject-function'.
+
+       (mime-preview/display-content): fixed about renaming.
+
+Sun May 19 16:16:42 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime-editor::edit-again): Decode contents by
+       Content-Transfer-Encoding field if they have charset field or they
+       are ``text'' types.
+
+\f
 Fri May 17 07:59:40 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.25 was released.
index 5284757..44a857b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els \
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.62.tar.gz
+TARFILE = tm7.63.tar.gz
 
 elc:
        $(EMACS) $(FLAGS) -l inst-tm -f compile-tm
diff --git a/TM-CFG b/TM-CFG
index f464042..d6566ca 100644 (file)
--- a/TM-CFG
+++ b/TM-CFG
@@ -1,8 +1,9 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: TM-CFG,v 6.0 1996/05/11 10:33:20 morioka Exp morioka $
+;;; $Id: TM-CFG,v 7.0 1996/05/20 16:24:30 morioka Exp morioka $
 ;;;
 
+(defvar default-load-path load-path)
 (setq load-path (append
                 (mapcar (function
                          (lambda (path)
 ;;;
 
 ;; Please specify install path prefix.
+(setq PREFIX
+      (if (or running-emacs-18 running-xemacs)
+         (expand-file-name "../../.." exec-directory)
+       (expand-file-name "../../../.." data-directory)
+       )) ; install to shared directory (maybe "/usr/local")
 ;;(setq PREFIX "~/")           ; install to you home directory
-(setq PREFIX "/usr/local/")    ; install to shared directory
-;;(setq PREFIX "/lab/local")
 
 ;; Please specify tm package prefix [optional]
 (setq TM_PACKAGE_PREFIX "")
 ;;; @ optional settings
 ;;;
 
-(setq EMACS_PREFIX
-      (cond ((boundp 'NEMACS) "nemacs")
-           ((boundp 'MULE)   "mule")
-           ((string-match "XEmacs" emacs-version) "xemacs")
-           (t "emacs")
-           ))
-
-(setq DATA_PREFIX
-      (if (or (< emacs-major-version 19)
-             (< emacs-minor-version 29)
-             )
-         "lib"
-       "share"))
-
-(setq DATADIR (expand-file-name DATA_PREFIX PREFIX))
-
 (setq LISP_PREFIX
       (if (>= emacs-major-version 19)
          "site-lisp"
        "local.lisp"))
 
-(setq EMACS_DATADIR (expand-file-name EMACS_PREFIX DATADIR))
-
-(defvar LISPDIR (expand-file-name LISP_PREFIX EMACS_DATADIR))
-
+(defvar LISPDIR
+  (or
+   (catch 'tag
+     (let ((rest default-load-path)
+          dir)
+       (while (setq dir (car rest))
+        (if (string-match
+             (expand-file-name (concat ".*/" LISP_PREFIX) PREFIX) dir)
+            (throw 'tag (substring dir 0 (match-end 0)))
+          )
+        (setq rest (cdr rest))
+        )))
+   (expand-file-name (concat
+                     (if running-emacs-19
+                         "share/"
+                       "lib/")
+                     (cond ((boundp 'NEMACS) "nemacs/")
+                           ((boundp 'MULE)   "mule/")
+                           (running-xemacs
+                            (if (featurep 'mule)
+                                "xmule/"
+                              "xemacs/"))
+                           (t "emacs/"))
+                     LISP_PREFIX) PREFIX)
+   ))
 
 ;; Please specify mime-setup.{el|elc} install path.
 (setq SETUP_FILE_DIR LISPDIR)
 
-
 (setq TM_LISPDIR (expand-file-name TM_PACKAGE_PREFIX LISPDIR))
 
 (setq TL_DIR (expand-file-name TL_PREFIX TM_LISPDIR))
index af828b1..4950816 100644 (file)
@@ -1,3 +1,12 @@
+Mon May 20 15:29:30 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm/gnus: Version 7.61 was released.
+
+       * tm-sgnus.el: Unnecessary `(call-after-loaded 'tm-view ...)' 
+       about setting to variable `mime-viewer/quitting-method-alist' and
+       `mime-viewer/show-summary-method' was deleted.
+
+\f
 Thu May  9 18:52:46 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tm/gnus: Version 7.60 was released.
index 6409835..1f385e1 100644 (file)
@@ -30,7 +30,7 @@ FILES = tm/gnus/Makefile tm/gnus/*-path tm/gnus/mk-tgnus \
                tm/gnus/*.el tm/gnus/ChangeLog tm/doc/tm-gnus*.texi 
 
 
-TARFILE = tm-gnus7.59.tar
+TARFILE = tm-gnus7.61.tar
 
 
 gnus:
index 45d416a..095be12 100644 (file)
@@ -7,7 +7,7 @@
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/09/24
-;;; Version: $Revision: 7.60 $
+;;; Version: $Revision: 7.61 $
 ;;; Keywords: news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -41,7 +41,7 @@
 ;;;
 
 (defconst tm-gnus/RCS-ID
-  "$Id: tm-sgnus.el,v 7.60 1996/05/09 18:52:46 morioka Exp $")
+  "$Id: tm-sgnus.el,v 7.61 1996/05/20 15:29:30 morioka Exp $")
 
 (defconst tm-gnus/version
   (concat (get-version-string tm-gnus/RCS-ID) " for September"))
@@ -136,16 +136,12 @@ This variable is set to `gnus-show-mime'.")
       (gnus-summary-select-article nil t)
     ))
 
-(call-after-loaded
- 'tm-view
- (lambda ()
-   (set-alist 'mime-viewer/quitting-method-alist
-             'gnus-original-article-mode
-             (function mime-viewer/quitting-method-for-sgnus))
-   (set-alist 'mime-viewer/show-summary-method
-             'gnus-original-article-mode
-             (function mime-viewer/quitting-method-for-sgnus))
-   ))
+(set-alist 'mime-viewer/quitting-method-alist
+          'gnus-original-article-mode
+          (function mime-viewer/quitting-method-for-sgnus))
+(set-alist 'mime-viewer/show-summary-method
+          'gnus-original-article-mode
+          (function mime-viewer/quitting-method-for-sgnus))
 
 
 ;;; @ for tm-partial
diff --git a/inst-tm b/inst-tm
index b08ad03..b12c228 100644 (file)
--- a/inst-tm
+++ b/inst-tm
@@ -1,6 +1,6 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 7.0 1996/05/08 15:05:03 morioka Exp $
+;;; $Id: inst-tm,v 7.0 1996/05/08 15:05:03 morioka Exp morioka $
 ;;;
 
 (load-file "TM-CFG")
index e5c3b27..7a5a42d 100644 (file)
@@ -1,3 +1,11 @@
+Mon May 20 15:24:56 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm/mh-e: Version 7.62 was released.
+
+       * tm-mh-e.el: Setting for variable
+       `mime-viewer/show-summary-method' was added.
+
+\f
 Wed May 15 15:39:54 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tm/mh-e: Version 7.61.1 was released.
index c3ddc5a..f12f673 100644 (file)
@@ -24,7 +24,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.61.1.tar
+TARFILE = tm-mh-e7.62.tar
 
 
 elc:
index 4b6946d..fedc896 100644 (file)
@@ -9,7 +9,7 @@
 ;;; modified by YAMAOKA Katsumi <yamaoka@ga.sony.co.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1993/11/21 (obsolete mh-e-mime.el)
-;;; Version: $Revision: 7.61 $
+;;; Version: $Revision: 7.62 $
 ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -50,7 +50,7 @@
 ;;;
 
 (defconst tm-mh-e/RCS-ID
-  "$Id: tm-mh-e.el,v 7.61 1996/05/09 19:01:06 morioka Exp $")
+  "$Id: tm-mh-e.el,v 7.62 1996/05/20 15:24:56 morioka Exp $")
 
 (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID))
 
@@ -291,15 +291,9 @@ digest are inserted into the folder after that message."
 (set-alist 'mime-viewer/quitting-method-alist
           'mh-show-mode
           (function tm-mh-e/quitting-method))
-
-;; (defun tm-mh-e/set-window-configuration ()
-;;   (save-excursion
-;;     (set-buffer mh-show-buffer)
-;;     (setq mime::preview/original-window-configuration
-;;           (current-window-configuration))
-;;     ))
-
-;; (add-hook 'mh-show-hook 'tm-mh-e/set-window-configuration)
+(set-alist 'mime-viewer/show-summary-method
+          'mh-show-mode
+          (function tm-mh-e/quitting-method))
 
 (defun tm-mh-e/following-method (buf)
   (save-excursion
index 7237d52..faab4ea 100644 (file)
@@ -8,7 +8,7 @@
 ;;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1994/08/21 renamed from mime.el
-;;; Version: $Revision: 7.61 $
+;;; Version: $Revision: 7.62 $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.61 1996/05/16 00:44:26 morioka Exp $")
+  "$Id: tm-edit.el,v 7.62 1996/05/19 16:16:42 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -2618,9 +2618,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                                     )))
                ))
             (t
-             (let* ((str (rfc822/get-header-string-except
-                          "^Content-Type" ""))
-                    charset
+             (let* (charset
                     (pstr
                      (mapconcat (function
                                  (lambda (attr)
@@ -2634,17 +2632,36 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                                      )
                                    ))
                                 params ""))
-                    )
-               (if code-conversion
+                    encoding
+                    encoded)
+               (save-excursion
+                 (if (re-search-forward
+                      "Content-Transfer-Encoding:" nil t)
+                     (let ((beg (match-beginning 0))
+                           (hbeg (match-end 0))
+                           (end (rfc822/field-end)))
+                       (setq encoding
+                             (eliminate-top-spaces
+                              (rfc822/unfolding-string
+                               (buffer-substring hbeg end))))
+                       (if (or charset (string-equal type "text"))
+                           (progn
+                             (delete-region beg (1+ end))
+                             (goto-char (point-min))
+                             (if (search-forward "\n\n" nil t)
+                                 (progn
+                                   (mime-decode-region
+                                    encoding (match-end 0)(point-max))
+                                   (setq encoded t
+                                         encoding nil)
+                                   )))))))
+               (if (or code-conversion encoded)
                    (if charset
                        (mime-charset-decode-region (point-min)(point-max)
                                                    charset)
                      (character-decode-region (point-min)(point-max)
                                               mime/default-coding-system)
                      ))
-               (and str
-                    (setq pstr (concat pstr "\n" str))
-                    )
                (let ((he
                       (if (re-search-forward "^$" nil t)
                           (match-end 0)
@@ -2656,13 +2673,16 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                        (insert
                         (concat
                          "\n"
-                         (mime-create-tag (concat type "/" stype))
+                         (mime-create-tag
+                          (concat type "/" stype pstr) encoding)
                          ))
                        )
                    (delete-region (point-min) he)
                    (insert
-                    (concat "\n" (mime-create-tag
-                                  (concat type "/" stype pstr))))
+                    (concat "\n"
+                            (mime-create-tag
+                             (concat type "/" stype pstr) encoding)
+                            ))
                    ))
                ))))
        (if code-conversion
index c9b2d5e..cd3f386 100644 (file)
@@ -8,7 +8,7 @@
 ;;; modified by Steven L. Baur <steve@miranova.com>
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
-;;; Version: $Revision: 7.62 $
+;;; Version: $Revision: 7.63 $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -45,7 +45,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.62 1996/05/17 07:59:40 morioka Exp $")
+  "$Id: tm-view.el,v 7.63 1996/05/20 14:56:33 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
     "application/octet-stream"
     "application/x-selection" "application/x-comment"))
 
-(defvar mime-viewer/content-subject-omitting-Content-Type-list
+(defvar mime-viewer/content-button-ignored-ctype-list
   '("application/x-selection"))
 
-(defvar mime-viewer/content-subject-showing-Content-Type-list
+(defvar mime-viewer/content-button-visible-ctype-list
   '("application/pgp"))
 
 (defvar mime-viewer/uuencode-encoding-name-list '("x-uue" "x-uuencode"))
@@ -136,7 +136,7 @@ Each elements are regexp of field-name. [tm-view.el]")
          ":"))
 
 (defvar mime-viewer/visible-field-list
-  '("Dnas.*")
+  '("Dnas.*" "Message-Id")
   "All fields that match this list will be displayed in MIME preview buffer.
 Each elements are regexp of field-name. [tm-view.el]")
 
@@ -193,10 +193,10 @@ Each elements are regexp of field-name. [tm-view.el]")
     ))
 
 
-;;; @@ content subject
+;;; @@ content button
 ;;;
 
-(defun mime-preview/insert-content-subject
+(defun mime-preview/insert-content-button
   (rcnum cinfo ctype params subj encoding)
   (save-restriction
     (narrow-to-region (point)(point))
@@ -244,18 +244,18 @@ Each elements are regexp of field-name. [tm-view.el]")
                   (function mime-viewer/play-content))
     ))
 
-(defun mime-preview/default-content-subject-function
+(defun mime-preview/default-content-button-function
   (rcnum cinfo ctype params subj encoding)
   (if (and (consp rcnum)
           (not (member
                 ctype
-                mime-viewer/content-subject-omitting-Content-Type-list)))
-      (mime-preview/insert-content-subject
+                mime-viewer/content-button-ignored-ctype-list)))
+      (mime-preview/insert-content-button
        rcnum cinfo ctype params subj encoding)
     ))
 
-(defvar mime-preview/content-subject-function
-  (function mime-preview/default-content-subject-function))
+(defvar mime-preview/content-button-function
+  (function mime-preview/default-content-button-function))
 
 
 ;;; @@ content header filter
@@ -475,17 +475,17 @@ The compressed face will be piped to this command.")
     (set-buffer obuf)
     (setq nb (point))
     (narrow-to-region nb nb)
-    (funcall mime-preview/content-subject-function
+    (funcall mime-preview/content-button-function
             rcnum cinfo ctype params subj encoding)
     (if (mime-viewer/header-visible-p rcnum cinfo ctype)
        (mime-preview/display-header beg he)
       )
     (if (and (null rcnum)
             (member
-             ctype mime-viewer/content-subject-showing-Content-Type-list))
+             ctype mime-viewer/content-button-visible-ctype-list))
        (save-excursion
          (goto-char (point-max))
-         (mime-preview/insert-content-subject
+         (mime-preview/insert-content-button
           rcnum cinfo ctype params subj encoding)
          ))
     (cond ((mime-viewer/body-visible-p rcnum cinfo ctype)
@@ -499,7 +499,7 @@ The compressed face will be piped to this command.")
                (null (mime::content-info/children cinfo))
                )
           (goto-char (point-max))
-          (mime-preview/insert-content-subject
+          (mime-preview/insert-content-button
            rcnum cinfo ctype params subj encoding)
           ))
     (mime-preview/default-content-separator rcnum cinfo ctype params subj)