From: morioka <morioka>
Date: Mon, 2 Mar 1998 14:19:24 +0000 (+0000)
Subject: tm 6.11
X-Git-Tag: tm6_11~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72e1a97705e4603b58537cf24773ce4fcde9a146;p=elisp%2Ftm.git

tm 6.11
---

diff --git a/Makefile b/Makefile
index 213a926..16a5951 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1995/01/13 00:13:17 morioka Exp morioka $
+# $Id: Makefile,v 2.0 1995/03/26 16:27:41 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -38,11 +38,12 @@ FILES	= tm/README.eng tm/rel-*.ol tm/Makefile tm/Makefile.bc \
 	tm/mh-e/Makefile tm/mh-e/Makefile.bc tm/mh-e/*.el \
 	tl/README.eng tl/Makefile tl/Makefile.bc tl/*.el tl/doc/*.texi
 
-TARFILE = tm6.10.tar
+TARFILE = tm6.11.tar
 
 
 nemacs:
 	make -f Makefile.bc all \
+		OPT='-l $(TLSRCDIR)/tl-18.el' \
 		EMACS=$(NEMACS) EMACS_TYPE=nemacs TLSRCDIR=$(TLSRCDIR)
 
 install-nemacs:	nemacs
@@ -51,6 +52,7 @@ install-nemacs:	nemacs
 
 mule1:
 	make -f Makefile.bc all \
+		OPT='-l $(TLSRCDIR)/tl-18.el' \
 		EMACS=$(MULE1) EMACS_TYPE=mule TLSRCDIR=$(TLSRCDIR)
 
 install-mule1:	mule1
diff --git a/Makefile.bc b/Makefile.bc
index 5b9b2c1..79f0a43 100644
--- a/Makefile.bc
+++ b/Makefile.bc
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.bc,v 1.4 1995/01/31 10:44:26 morioka Exp morioka $
+# $Id: Makefile.bc,v 2.0 1995/03/26 16:25:44 morioka Exp morioka $
 #
 
 TMMEL	= tm-view.el tm-rmail.el tm-comp.el
@@ -27,6 +27,7 @@ signature.elc:	signature.el
 tiny-mime.elc:	tiny-mime.el
 	$(EMACS) -batch -q . \
 		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-header.el \
+		$(OPT) \
 		-f batch-byte-compile $<
 
 tm-misc.elc:	tm-misc.el
@@ -34,6 +35,7 @@ tm-misc.elc:	tm-misc.el
 		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-list.el \
 		-l $(TLSRCDIR)/tl-header.el \
 		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
+		$(OPT) \
 		-l tm-$(EMACS_TYPE).el -l tiny-mime.el \
 		-f batch-byte-compile $<
 
@@ -42,6 +44,7 @@ tm-$(EMACS_TYPE).elc:	tm-$(EMACS_TYPE).el
 		-l $(TLSRCDIR)/tl-str.el \
 		-l $(TLSRCDIR)/tl-list.el \
 		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
+		$(OPT) \
 		-f batch-byte-compile $<
 
 $(TMMELC):	$(TMMEL)
@@ -49,6 +52,7 @@ $(TMMELC):	$(TMMEL)
 		-l $(TLSRCDIR)/tl-str.el -l $(TLSRCDIR)/tl-list.el \
 		-l $(TLSRCDIR)/tl-header.el \
 		-l $(TLSRCDIR)/tl-$(EMACS_TYPE).el \
+		$(OPT) \
 		-l tm-$(EMACS_TYPE).el -l tiny-mime.el -l tm-misc.el \
 		-f batch-byte-compile $?
 
diff --git a/gnus/Makefile b/gnus/Makefile
index e847c7e..95de0b3 100644
--- a/gnus/Makefile
+++ b/gnus/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1995/01/13 20:50:22 morioka Exp morioka $
+# $Id: Makefile,v 2.0 1995/03/26 16:49:12 morioka Exp morioka $
 #
 
 # Please specify emacs executables:
@@ -26,25 +26,37 @@
 	TMSRCDIR = ..
 	TLSRCDIR = ../../tl
 
+	EMACS18_GNUS3 = gnus
+	EMACS18_NNTP3 = nntp
 
+	EMACS18_GNUS4 = /usr/local/lib/emacs/local.lisp/gnus-4.1/lisp/gnus
+	EMACS18_NNTP4 = /usr/local/lib/emacs/local.lisp/gnus-4.1/lisp/nntp
+
+	EMACS19_GNUS  = gnus
+	EMACS19_NNTP  = nntp
+	
 nemacs-gnus3:
 	make -f Makefile.bc all \
 		EMACS=$(NEMACS) EMACS_TYPE=nemacs GNUS_TYPE=gnus3 \
+		GNUS=$(EMACS18_GNUS3) NNTP=$(EMACS18_NNTP3) \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 nemacs-gnus4:
 	make -f Makefile.bc all \
 		EMACS=$(NEMACS) EMACS_TYPE=nemacs GNUS_TYPE=gnus4 \
+		GNUS=$(EMACS18_GNUS4) NNTP=$(EMACS18_NNTP4) \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 mule1-gnus3:
 	make -f Makefile.bc all \
 		EMACS=$(MULE1) EMACS_TYPE=mule GNUS_TYPE=gnus3 \
+		GNUS=$(EMACS18_GNUS3) NNTP=$(EMACS18_NNTP3) \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 mule1-gnus4:
 	make -f Makefile.bc all \
 		EMACS=$(MULE1) EMACS_TYPE=mule GNUS_TYPE=gnus4 \
+		GNUS=$(EMACS18_GNUS4) NNTP=$(EMACS18_NNTP4) \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 install-18:
@@ -56,11 +68,13 @@ install-18:
 orig19:
 	make -f Makefile.bc all \
 		EMACS=$(ORIG19) EMACS_TYPE=orig GNUS_TYPE=gnus4 \
+		GNUS=$(EMACS19_GNUS) NNTP=$(EMACS19_NNTP) \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 mule2:
 	make -f Makefile.bc all \
 		EMACS=$(MULE2) EMACS_TYPE=mule GNUS_TYPE=gnus4 \
+		GNUS=$(EMACS19_GNUS) NNTP=$(EMACS19_NNTP) \
 		TLDIR=$(TLSRCDIR) TMDIR=$(TMSRCDIR)
 
 install-19:
diff --git a/gnus/Makefile.bc b/gnus/Makefile.bc
index 7ab7da2..13c2c83 100644
--- a/gnus/Makefile.bc
+++ b/gnus/Makefile.bc
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.bc,v 1.2 1995/01/13 20:51:03 morioka Exp $
+# $Id: Makefile.bc,v 2.0 1995/03/26 16:49:33 morioka Exp morioka $
 #
 
 .SUFFIXES:	.el .elc
@@ -11,7 +11,8 @@
 		-l $(TMDIR)/tm-$(EMACS_TYPE).el \
 		-l $(TMDIR)/tiny-mime.el -l $(TMDIR)/tm-misc.el \
 		-l $(TMDIR)/tm-view.el \
-		-l gnus -l tm-$(GNUS_TYPE).el -l tm-gnus.el \
+		-l $(GNUS) -l $(NNTP) \
+		-l tm-$(GNUS_TYPE).el -l tm-gnus.el \
 		-f batch-byte-compile $<
 
 all:	tm-gnus.elc tm-$(GNUS_TYPE).elc
@@ -19,4 +20,3 @@ all:	tm-gnus.elc tm-$(GNUS_TYPE).elc
 tm-gnus.elc:	tm-gnus.el
 
 tm-$(GNUS_TYPE).elc:	tm-$(GNUS_TYPE).el
-
diff --git a/methods/tmdecode b/methods/tmdecode
index b3cf43a..b09d8ae 100755
--- a/methods/tmdecode
+++ b/methods/tmdecode
@@ -7,8 +7,8 @@ case "binary":
 	/bin/cp $2 $3
 	breaksw
 case "base64":
-	decode-b < $2 > $3
-	#mmencode -u $2 > $3
+	#decode-b < $2 > $3
+	mmencode -u $2 > $3
 	breaksw
 case "quoted-printable":
 	mmencode -q -u $2 > $3
diff --git a/tm-partial.el b/tm-partial.el
index 9954209..6412261 100644
--- a/tm-partial.el
+++ b/tm-partial.el
@@ -4,11 +4,12 @@
 ;;; Grabbing all MIME "message/partial"s.
 ;;; by Yasuo OKABE @ Kyoto University 1994
 ;;; modified by MORIOKA Tomohiko
+;;;         and Shuhei KOBAYASHI <shuhei@cmpt01.phys.tohoku.ac.jp>
 
 ;; original file is 
 ;;  gif.el written by Art Mellor @ Cayman Systems, Inc. 1991
 
-;;; $Id: tm-partial.el,v 2.0 1995/03/12 16:14:44 morioka Exp $
+;;; $Id: tm-partial.el,v 3.1 1995/03/26 17:13:20 morioka Exp $
 
 (require 'tm-view)
 
@@ -24,19 +25,35 @@
 
 (defvar mime/gp:subject-start-regexp "[ \t]*\\(v[0-9]+i[0-9]+:[ \t]+\\)?")
 
-(defvar mime/gp:subject-end-regexp "\\([[(]?\\)\\([0-9]+\\)\\(/\\| [oO][fF] \\)\\([0-9]+\\)\\([])]?\\)[ \t]*$")
+(defvar mime/gp:subject-end-regexp
+  "\\([[(]?\\)\\([0-9]+\\)\\(/\\| [oO][fF] \\)\\([0-9]+\\)\\([])]?\\)[ \t]*$")
 
 ;; display Article at the cursor in Subject buffer.
 (defun mime/gp:display-article ()
   (save-excursion   
     (cond
      ((eq target 'gnus4)
-      (gnus-summary-display-article (gnus-summary-article-number)))
+      (gnus-summary-display-article (gnus-summary-article-number))
+      )
      ((eq target 'mh-e)
-      (mh-show))
-     (t
-	(error "Fatal. Unsupported mode")))))
-   
+      (mh-show)
+      )
+     ((eq target 'vm)
+      (let ((vm-follow-summary-cursor t))
+        (vm-follow-summary-cursor)
+        (vm-select-folder-buffer)
+        (vm-check-for-killed-summary)
+        (vm-error-if-folder-empty)
+        (vm-display (current-buffer) t '(tm-vm/view-message)
+                    '(tm-vm/view-mesage reading-message))
+        (vm-widen-page)
+        (goto-char (point-max))
+        (widen)
+        (narrow-to-region (point) (vm-start-of (car vm-message-pointer)))
+        (goto-char (point-min))
+	))
+     (t (error "Fatal. Unsupported mode")))))
+
 (defun mime/decode-message/grab-partials (beg end cal)
   (interactive)
   (let* ((id (cdr (assoc "id" cal)))
@@ -51,15 +68,20 @@
 	 (part-num 1)
 	 (part-missing nil))
     (cond ((eq major-mode 'gnus-article-mode)
-	   (progn
-	     (setq subject-buf gnus-summary-buffer)
-	     (setq target 'gnus4)))
+	   (setq subject-buf gnus-summary-buffer)
+	   (setq target 'gnus4)
+	   )
 	  ((eq major-mode 'mh-show-mode)
-	   (progn
-	     (string-match "^show-\\(.+\\)$" article-buf)
-	     (setq subject-buf (substring article-buf (match-beginning 1) (match-end 1)))
-	     (setq target 'mh-e)))
-	  (t (error "%s is not supported. Sorry." major-mode)))
+	   (string-match "^show-\\(.+\\)$" article-buf)
+	   (setq subject-buf
+		 (substring article-buf (match-beginning 1) (match-end 1)))
+	   (setq target 'mh-e)
+	   )
+          ((eq major-mode 'vm-mode)
+           (setq subject-buf vm-summary-buffer)
+           (setq target 'vm)
+	   )
+          (t (error "%s is not supported. Sorry." major-mode)))
     
     (if (and (eq beg (point-min)) (eq end (point-max)))
 	(save-excursion
@@ -175,4 +197,10 @@
 	     (major-mode . mh-show-mode)
 	     ))
 
+(set-atype 'mime/content-decoding-condition
+	   '((type . "message/partial")
+	     (method . mime/decode-message/grab-partials)
+	     (major-mode . vm-mode)
+ 	     ))
+
 (provide 'tm-partial)
diff --git a/tm-view.el b/tm-view.el
index 2532c65..35a5ec9 100644
--- a/tm-view.el
+++ b/tm-view.el
@@ -20,7 +20,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.10 1995/03/14 12:39:41 morioka Exp $")
+  "$Id: tm-view.el,v 6.11 1995/03/23 09:59:10 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -691,12 +691,12 @@
 	 file
 	 (mother mime::article/preview-buffer))
     (if (not (file-exists-p root-dir))
-	(shell-command (concat "mkdir " root-dir))
+	(make-directory root-dir)
       )
     (setq id (replace-as-filename id))
     (setq root-dir (concat root-dir "/" id))
     (if (not (file-exists-p root-dir))
-	(shell-command (concat "mkdir " root-dir))
+	(make-directory root-dir)
       )
     (setq file (concat root-dir "/FULL"))
     (if (not (file-exists-p file))
diff --git a/tm-vm.el b/tm-vm.el
index f119edd..56b1b96 100644
--- a/tm-vm.el
+++ b/tm-vm.el
@@ -15,7 +15,7 @@
 (require 'vm)
 
 (defconst tm-vm/RCS-ID
-  "$Id: tm-vm.el,v 2.0 1995/03/11 22:57:32 morioka Exp $")
+  "$Id: tm-vm.el,v 3.0 1995/03/26 17:16:53 morioka Exp $")
 (defconst tm-vm/version (get-version-string tm-vm/RCS-ID))
 
 (define-key vm-mode-map "Z" 'tm-vm/view-message)
@@ -58,7 +58,8 @@
   (goto-char (point-min))
   (if vm-honor-page-delimiters
       (vm-narrow-to-page))
-  (select-window (get-buffer-window vm-summary-buffer))
+  (if vm-summary-buffer
+      (select-window (get-buffer-window vm-summary-buffer)))
   )
 
 (defun tm-vm/view-message ()