From: morioka <morioka>
Date: Tue, 10 Mar 1998 17:30:32 +0000 (+0000)
Subject: tm 7.105.1.
X-Git-Tag: tm-7_105_1~1
X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Ftm.git;a=commitdiff_plain;h=e02ad5f113d807883ee7754988b6e28dd7949c3a

tm 7.105.1.
---

diff --git a/ChangeLog b/ChangeLog
index 83e01b9..1482604 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1997-03-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* emu: Version 7.38.1 was released.
+	* MU: Version 0.40 was released.
+	* MEL: Version 6.2.2 was released.
+	* tm: Version 7.105.1 was released.
+
+1997-02-18  MORIOKA Tomohiko  <tmorioka@mule.etl.go.jp>
+
+	* tm-view.el (mime-viewer/define-keymap): Don't suppress-keymap if
+ 	mother is exist.
+
+
 1997-02-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* emu: Version 7.38 was released.
diff --git a/Makefile b/Makefile
index 88840dc..cfdbe05 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # $Id: Makefile,v 7.45 1997/01/10 15:42:29 morioka Exp morioka $
 #
 
-VERSION = 7.105
+VERSION = 7.105.1
 
 SHELL	= /bin/sh
 MAKE	= make
diff --git a/tm-view.el b/tm-view.el
index e84e33f..25aa9fc 100644
--- a/tm-view.el
+++ b/tm-view.el
@@ -4,7 +4,7 @@
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
-;; Version: $Revision: 7.81 $
+;; Version: $Revision: 7.82 $
 ;; Keywords: mail, news, MIME, multimedia
 
 ;; This file is part of tm (Tools for MIME).
@@ -42,7 +42,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.81 1997/02/10 06:03:38 morioka Exp $")
+  "$Id: tm-view.el,v 7.82 1997/02/18 10:51:17 tmorioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -732,8 +732,10 @@ The compressed face will be piped to this command.")
 (defun mime-viewer/define-keymap (&optional mother)
   (let ((mime/viewer-mode-map (if mother
 				  (copy-keymap mother)
-				(make-keymap))))
-    (suppress-keymap mime/viewer-mode-map)
+				(make-keymap)
+				)))
+    (or mother
+	(suppress-keymap mime/viewer-mode-map))
     (define-key mime/viewer-mode-map
       "u"        (function mime-viewer/up-content))
     (define-key mime/viewer-mode-map