tm 7.43.1.
authormorioka <morioka>
Mon, 9 Mar 1998 15:46:17 +0000 (15:46 +0000)
committermorioka <morioka>
Mon, 9 Mar 1998 15:46:17 +0000 (15:46 +0000)
12 files changed:
ChangeLog
Makefile
gnus/ChangeLog
gnus/s-path
gnus/tm-sgnus.el
mh-e/ChangeLog
mh-e/tm-mh-e.el
mime-setup.el
mk-tm
tm-image.el
tm-mule.el
tm-view.el

index 2d292d1..64b929e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+Wed Feb 14 09:15:36 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.11.1 was released.
+       * tm: Version 7.43.1 was released.
+       * tm/gnus: Version 7.45 was released.   
+
+       * mime-setup.el: lambda functions are defined by defun.
+       (mime-setup-decode-message-header): New function.
+       (mime-setup-set-signature-key): New function.
+       (mime-setup-mh-draft-setting): New function.
+
+       * mime-setup.el: insert `(setq buffer-read-only nil)' into
+       `mh-letter-mode-hook' (cf. [tm-ja:1576])
+
+Tue Feb 13 17:56:43 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-image.el (mime-preview/x-face-function-for-xemacs):
+       New function.
+       (bitmap-read-xbm): New implementation for XEmacs.
+
+Tue Feb 13 14:00:02 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-image.el: typo was fixed.
+
+Tue Feb 13 13:53:06 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-image.el (mime-preview/x-face-function): New variable.
+       Function `mime-preview/x-face-function' was renamed to
+       `mime-preview/x-face-function-for-mule'.
+
+       * tm-image.el (mime-preview/x-face-function):
+       fixed problem to indent.
+
+       * tm-image.el (mime-preview/x-face-function):
+       New function for Mule.
+       (mime-viewer/x-face-to-xbm-command): New variable.
+
+       * tm-view.el (mime-viewer/x-face-to-pbm-command): New variable.
+       (mime-viewer/ignored-field-list): "X-Face" was deleted.
+
+Mon Feb 12 16:02:05 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-mule.el: "SHIFT_JIS" and "X-SHIFTJIS" were added to
+       `mime/charset-coding-system-alist'.
+
+Mon Feb 12 13:05:02 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-image.el (mime-preview/filter-for-image): protect for error
+       when file deleting (cf. [tm-en:317])
+
+\f
 Fri Feb  9 06:57:20 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
 
        * tm: Version 7.43 was released.
index 2da3968..97bb6d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi \
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.43.tar.gz
+TARFILE = tm7.43.1.tar.gz
 
 
 18:
index a0911f7..6170cf6 100644 (file)
@@ -1,3 +1,20 @@
+Wed Feb 14 13:01:34 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm/gnus: Version 7.45 was released.
+
+Fri Feb  9 10:30:48 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-sgnus.el: Function `tm-gnus/prepare-save-mail-function' is
+       inserted to `nnbabyl-prepare-save-mail-hook',
+       `nnml-prepare-save-mail-hook' and `nnmh-prepare-save-mail-hook' if
+       Mule is running.
+
+Fri Feb  9 10:20:19 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-sgnus.el (tm-gnus/nnmail-get-new-mail): new function.
+       `nnmail-get-new-mail' is redefine if Mule is running.
+
+\f
 Fri Feb  9 08:47:07 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
 
        * tm/gnus: Version 7.43 was released.
index dd28a98..c76233f 100644 (file)
@@ -9,7 +9,7 @@
 ;; please edit
 
 ;; It is relative style. Added path is searched from load-path.
-(add-path "sgnus-0.36/lisp/" 'all-paths)
+(add-path "sgnus-0.38/lisp/" 'all-paths)
 
 ;; It is absolute style.
 ;; (add-path "/usr/local/share/emacs/site-lisp/sgnus/lisp/")
index c9b73ee..a27958f 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.43 $
+;;; Version: $Revision: 7.45 $
 ;;; 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.43 1996/02/09 08:13:33 morioka Exp $")
+  "$Id: tm-sgnus.el,v 7.45 1996/02/09 10:30:48 morioka Exp $")
 
 (defconst tm-gnus/version
   (concat (get-version-string tm-gnus/RCS-ID) " for September"))
@@ -228,10 +228,16 @@ This variable is set to `gnus-show-mime'.")
       (defun tm-gnus/prepare-save-mail-function ()
        (setq file-coding-system *noconv*)
        )
-      (add-hook 'nnfolder-prepare-save-mail-hook
-               'tm-gnus/prepare-save-mail-function)
       (add-hook 'nnmbox-prepare-save-mail-hook
                'tm-gnus/prepare-save-mail-function)
+      (add-hook 'nnbabyl-prepare-save-mail-hook
+               'tm-gnus/prepare-save-mail-function)
+      (add-hook 'nnml-prepare-save-mail-hook
+               'tm-gnus/prepare-save-mail-function)
+      (add-hook 'nnmh-prepare-save-mail-hook
+               'tm-gnus/prepare-save-mail-function)
+      (add-hook 'nnfolder-prepare-save-mail-hook
+               'tm-gnus/prepare-save-mail-function)
       
       (defun tm-gnus/nnheader-find-file-noselect (&rest args)
        (let ((file-coding-system-for-read *noconv*))
@@ -242,6 +248,19 @@ This variable is set to `gnus-show-mime'.")
        '(fset 'nnheader-find-file-noselect
              'tm-gnus/nnheader-find-file-noselect)
        )
+      
+      (defun tm-gnus/nnmail-get-new-mail (&rest args)
+       (let ((file-coding-system-for-read *noconv*))
+         (apply (function tm-gnus/original-nnmail-get-new-mail) args)
+         ))
+      (eval-after-load
+       "nnmail"
+       '(progn (or (fboundp 'tm-gnus/original-nnmail-get-new-mail)
+                  (fset 'tm-gnus/original-nnmail-get-new-mail
+                        (symbol-function 'nnmail-get-new-mail))
+                  )
+              (fset 'nnmail-get-new-mail 'tm-gnus/nnmail-get-new-mail)
+              ))
       ))
 
 
index fd76a27..f8d4dec 100644 (file)
@@ -1,3 +1,17 @@
+Tue Feb 13 07:19:09 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-mh-e.el (tm-mh-e/content-header-filter): Code for hilit19 was
+       deleted. Please set to `mime-viewer/content-header-filter-hook'.
+
+\f
+Thu Jan 25 15:14:27 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm/mh-e: Version 7.47 was released.
+
+       * tm-mh-e.el: Michael Sperber [Mr. Preprocessor]
+       <sperber@informatik.uni-tuebingen.de>'s patch was applied.
+       (cf. [bug-tm-en:288])
+
 Thu Jan 25 15:00:14 1996  Michael Sperber <sperber@informatik.uni-tuebingen.de>
 
        * tm-mh-e.el: I remember making this change for 6.80.1, but it
@@ -6,6 +20,7 @@ Thu Jan 25 15:00:14 1996  Michael Sperber <sperber@informatik.uni-tuebingen.de>
        about the window configuration when making an update.
        (cf. [bug-tm-en:288])
 
+\f
 Tue Jan 23 04:51:18 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
 
        * tm/mh-e: Version 7.46 was released.
index aec9216..1774426 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.47 $
+;;; Version: $Revision: 7.48 $
 ;;; Keywords: mail, MH, MIME, multimedia, encoded-word, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -47,7 +47,7 @@
 ;;;
 
 (defconst tm-mh-e/RCS-ID
-  "$Id: tm-mh-e.el,v 7.47 1996/01/25 15:14:27 morioka Exp $")
+  "$Id: tm-mh-e.el,v 7.48 1996/02/13 07:19:09 morioka Exp $")
 
 (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID))
 
@@ -236,9 +236,6 @@ With arg, turn MIME processing on if arg is positive."
   (tm-mh-e/code-convert-region-to-emacs (point-min)(point-max)
                                        mime/default-coding-system)
   (mime/decode-message-header)
-  (if (featurep 'hilit19)
-      (hilit-rehighlight-buffer-quietly)
-    )
   )
 
 (defun tm-mh-e/quitting-method ()
index e611caf..816c708 100644 (file)
@@ -2,11 +2,11 @@
 ;;; mime-setup.el --- setup file for tm viewer and composer.
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: mime-setup.el,v 7.12 1995/11/29 21:51:05 morioka Exp $
+;;;    $Id: mime-setup.el,v 7.14 1996/02/14 09:15:36 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -24,6 +24,8 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with This program.  If not, write to the Free Software
 ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;
+;;; Code:
 
 (require 'tm-setup)
 
 (autoload 'mime/decode-message-header "tm-ew-d"
   "Decode MIME encoded-words in message header." t)
 
-(add-hook 'mime/editor-mode-hook
-         (function
-          (lambda ()
-            (save-excursion
-              (save-restriction
-                (goto-char (point-min))
-                (narrow-to-region
-                 (point-min)
-                 (if (re-search-forward
-                      (concat "^" (regexp-quote mail-header-separator) "$")
-                      nil t)
-                     (match-beginning 0)
-                   (point-max)
-                   ))
-                (mime/decode-message-header)
-                (set-buffer-modified-p nil)
-                )))))
+(defun mime-setup-decode-message-header ()
+  (save-excursion
+    (save-restriction
+      (goto-char (point-min))
+      (narrow-to-region
+       (point-min)
+       (if (re-search-forward
+           (concat "^" (regexp-quote mail-header-separator) "$")
+           nil t)
+          (match-beginning 0)
+        (point-max)
+        ))
+      (mime/decode-message-header)
+      (set-buffer-modified-p nil)
+      )))
+
+(add-hook 'mime/editor-mode-hook 'mime-setup-decode-message-header)
 
 
 ;;; @ variables
 ;;; @ for signature
 ;;;
 
+(defun mime-setup-set-signature-key ()
+  (let ((key (or (cdr (assq major-mode mime-setup-signature-key-alist))
+                mime-setup-default-signature-key)))
+    (define-key (current-local-map) key (function insert-signature))
+    ))
+
 (if mime-setup-use-signature
     (progn
       (autoload 'insert-signature "signature" "Insert signature" t)
-      (add-hook 'mime/editor-mode-hook
-               (function
-                (lambda ()
-                  (let ((key (or (cdr
-                                  (assq major-mode
-                                        mime-setup-signature-key-alist)
-                                  )
-                                 mime-setup-default-signature-key)))
-                    (define-key (current-local-map)
-                      key (function insert-signature))
-                    ))))
+      (add-hook 'mime/editor-mode-hook 'mime-setup-set-signature-key)
       (setq gnus-signature-file nil)
       (setq mail-signature nil)
       ))
 ;;; @ for mh-e
 ;;;
 
-(add-hook 'mh-letter-mode-hook
-         (function
-          (lambda ()
-            (mime/editor-mode)
-            (make-local-variable 'mail-header-separator)
-            (setq mail-header-separator "--------")
-            (save-excursion
-              (goto-char (point-min))
-              (if (re-search-forward "^-*$" nil t)
-                  (progn
-                    (replace-match mail-header-separator)
-                    (set-buffer-modified-p (buffer-modified-p))
-                    ))
-              )
-            )) t)
-
+(defun mime-setup-mh-draft-setting ()
+  (mime/editor-mode)
+  (make-local-variable 'mail-header-separator)
+  (setq mail-header-separator "--------")
+  (save-excursion
+    (goto-char (point-min))
+    (setq buffer-read-only nil)
+    (if (re-search-forward "^-*$" nil t)
+       (progn
+         (replace-match mail-header-separator)
+         (set-buffer-modified-p (buffer-modified-p))
+         ))
+    ))
+
+(add-hook 'mh-letter-mode-hook 'mime-setup-mh-draft-setting t)
 (add-hook 'mh-before-send-letter-hook 'mime-editor/maybe-translate)
 
 
 (provide 'mime-setup)
 
 (run-hooks 'mime-setup-load-hook)
+
+;;; mime-setup.el ends here
diff --git a/mk-tm b/mk-tm
index a37059a..741222e 100644 (file)
--- a/mk-tm
+++ b/mk-tm
 
 (setq tm-uncompile-el-files '("sc-setup.el"))
 
-(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))
-         )))
+(if (file-installed-p "ange-ftp.el")
     (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.elc" (car paths)))
-         (if (file-exists-p path)
-             (throw 'tag path)
-           )
-         (setq paths (cdr paths))
-         )))
+(if (file-installed-p "vm.elc")
     (setq tm-modules (append tm-modules '("tm-vm")))
   (setq tm-uncompile-el-files
        (append tm-uncompile-el-files '("tm-vm.el")))
index 44bf3e4..4772248 100644 (file)
@@ -8,7 +8,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/12/15
 ;;; Version:
-;;;    $Id: tm-image.el,v 4.0 1996/01/31 17:15:55 morioka Exp $
+;;;    $Id: tm-image.el,v 4.6 1996/02/13 17:56:43 morioka Exp $
 ;;;
 ;;; Keywords: mail, news, MIME, multimedia, image, picture
 ;;;
           "image/x-tiff" "image/x-pic" "image/x-mag" "image/x-xbm"))
 
        (defun bitmap-read-xbm (file)
-        (let ((gl (make-glyph file)))
+        (let (gl)
+          (while (progn
+                   (setq gl (make-glyph file))
+                   (eq (image-instance-type (glyph-image-instance gl))
+                       'text)
+                   ))
           (make-annotation gl (point) 'text)
           ))
+       
+       (defvar mime-preview/x-face-function
+        (function mime-preview/x-face-function-for-xemacs))
        )
       ((boundp 'MULE)
        (require 'bitmap)
        
        (defvar tm-image/inline-image-types '("image/x-mag" "image/x-xbm"))
+       
+       (defvar mime-preview/x-face-function
+        (function mime-preview/x-face-function-for-mule))
        ))
 
 (defvar mime-viewer/shell-command "/bin/sh")
     ("image/x-mag"  . "magtoppm < %s | ppmtoxpm > %s")
     ))
 
+(defvar mime-viewer/x-face-to-xbm-command
+  (concat mime-viewer/x-face-to-pbm-command " | pbmtoxbm"))
+
+(add-hook 'mime-viewer/content-header-filter-hook
+         mime-preview/x-face-function)
+
+(defun mime-preview/x-face-function-for-xemacs ()
+  (save-restriction
+    (narrow-to-region (point-min) (re-search-forward "^$" nil t))
+    (goto-char (point-min))
+    (if (re-search-forward "^X-Face:[ \t]*" nil t)
+       (let ((beg (match-end 0))
+             (end (rfc822/field-end))
+             (xbm-file
+              (make-temp-name (expand-file-name "tmxf" mime/tmp-dir))
+              ))
+         (call-process-region
+          beg end "sh" nil 0 nil
+          "-c"
+          (format "%s > %s"
+                  mime-viewer/x-face-to-xbm-command
+                  xbm-file))
+         (while (not (file-exists-p xbm-file)))
+         (delete-region beg end)
+         (bitmap-read-xbm xbm-file)
+         (condition-case nil
+             (delete-file xbm-file)
+           (error nil))
+         ))))
+
+(defun mime-preview/x-face-function-for-mule ()
+  (save-restriction
+    (narrow-to-region (point-min) (re-search-forward "^$" nil t))
+    (goto-char (point-min))
+    (if (re-search-forward "^X-Face:[ \t]*" nil t)
+       (let ((p (match-beginning 0))
+             (beg (match-end 0))
+             (end (rfc822/field-end))
+             (xbm-file
+              (concat
+               (make-temp-name (expand-file-name "tmxf" mime/tmp-dir))
+               ".xbm")
+              ))
+         (if (< end (point-max))
+             (setq end (1+ end))
+           )
+         (while (progn
+                  (call-process-region
+                   beg end "sh" nil 0 nil
+                   "-c"
+                   (format "%s > %s"
+                           mime-viewer/x-face-to-xbm-command
+                           xbm-file))
+                  (not (file-exists-p xbm-file))
+                  ))
+         (save-restriction
+           (narrow-to-region p end)
+           (delete-region p end)
+           (goto-char p)
+           (while (progn
+                    (condition-case nil
+                        (bitmap-read-xbm xbm-file)
+                      (error nil))
+                    (kill-buffer 
+                     (some-element
+                      (function
+                       (lambda (buf)
+                         (string-equal (buffer-file-name buf) xbm-file)
+                         ))
+                      (buffer-list)))
+                    (= (point-min) (point-max))
+                    ))
+           (goto-char p)
+           (insert "X-Face: ")
+           (while (re-search-forward "^." nil t)
+             (goto-char (match-beginning 0))
+             (insert "        ")
+             ))
+         (condition-case nil
+             (delete-file xbm-file)
+           (error nil))
+         ))))
+
 
 ;;; @ content filter for images
 ;;;
                 )
          (setq gl (make-glyph xbm-file))
          (setq annot (make-annotation gl (point) 'text))
-         (delete-file orig-file)
-         (delete-file xbm-file)
+         (unwind-protect
+             (delete-file orig-file)
+           (condition-case nil
+               (delete-file xbm-file)
+             (error nil)))
          (goto-char (point-max))
          (insert "\n")
          (message "Translation done.")
index 2272b08..9c1a941 100644 (file)
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-mule.el,v 7.7 1996/01/25 02:32:26 morioka Exp $
+;;;    $Id: tm-mule.el,v 7.8 1996/02/12 16:02:05 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -50,6 +50,8 @@
     ("ISO-8859-8"      . *iso-8859-8*)
     ("ISO-8859-9"      . *iso-8859-9*)
     ("ISO-2022-INT-1"  . *iso-2022-int-1*)
+    ("SHIFT_JIS"       . *sjis*)
+    ("X-SHIFTJIS"      . *sjis*)
     ))
 
 
index 4d09531..99e6f9a 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.41 $
+;;; Version: $Revision: 7.42 $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -44,7 +44,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.41 1996/01/25 03:24:35 morioka Exp $")
+  "$Id: tm-view.el,v 7.42 1996/02/13 06:28:37 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
   '(".*Received" ".*Path" ".*Id" "References"
     "Replied" "Errors-To"
     "Lines" "Sender" ".*Host" "Xref"
-    "Content-Type" "Precedence" "X-Face"
+    "Content-Type" "Precedence"
     "Status" "X-VM-.*")
   "All fields that match this list will be hidden in MIME preview buffer.
 Each elements are regexp of field-name. [tm-view.el]")
@@ -334,8 +334,12 @@ Each elements are regexp of field-name. [tm-view.el]")
 
 ;; hack from Gnus 5.0.4.
 
+(defvar mime-viewer/x-face-to-pbm-command
+  "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm")
+
 (defvar mime-viewer/x-face-command
-  "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -"
+  (concat mime-viewer/x-face-to-pbm-command
+         " | xv -quit -")
   "String to be executed to display an X-Face field.
 The command will be executed in a sub-shell asynchronously.
 The compressed face will be piped to this command.")