tm 7.70.

diff --git a/ChangeLog b/ChangeLog
index ebda76d..5c6f868 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+Tue Jul  9 13:30:32 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.31.1 was released.
+       * tm: Version 7.70 was released.
+
+       * tm-edit.el (mime/editor-mode): Don't toggle.
+       (mime-editor/toggle-mode): New function.
+
+Tue Jul  2 14:06:53 1996  Alastair Burt <burt@dfki.uni-kl.de>
+
+       * tm-edit.el: use function `add-minor-mode' for XEmacs.
+
+Mon Jul  8 05:44:22 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-image.el: `(require 'xpm)' was deleted.
+
+Thu Jul  4 16:57:03 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-def.el (tm:button-dispatcher): don't move to preview buffer.
+
+Mon Jul  1 23:45:34 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-evs.el (tm-evs/define-keys): New function.
+       Use `mime-viewer/define-keymap-hook'.
+
+Mon Jul  1 23:43:25 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-bbdb.el (tm-bbdb/define-keys): New function.
+       Use `mime-viewer/define-keymap-hook'.
+
+       * tm-view.el: Variable `mime/viewer-mode-map' was abolished.
+       (mime-viewer/define-keymap): New function.
+       (mime/viewer-mode): Add new argument `mother-keymap'; use function
+       `mime-viewer/define-keymap'.
+
+\f
 Thu Jun 27 15:49:37 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.31 was released.

diff --git a/Makefile b/Makefile
index 0e29fbb..7f0800c 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.69.tar.gz
+TARFILE = tm7.70.tar.gz
 
 elc:
        $(EMACS) $(FLAGS) -l inst-tm -f compile-tm

diff --git a/gnus/tm-gnus5.el b/gnus/tm-gnus5.el
index c0c28d0..78db566 100644 (file)
--- a/gnus/tm-gnus5.el
+++ b/gnus/tm-gnus5.el
@@ -42,7 +42,7 @@
 ;;;
 
 (defconst tm-gnus/RCS-ID
-  "$Id: tm-gnus5.el,v 7.72 1996/06/27 14:35:40 morioka Exp $")
+  "$Id: tm-gnus5.el,v 7.72 1996/06/27 14:35:40 morioka Exp morioka $")
 
 (defconst tm-gnus/version
   (concat (get-version-string tm-gnus/RCS-ID) " for Gnus 5.2 or later"))
@@ -233,7 +233,8 @@ This variable is set to `gnus-show-mime'.")
           (set-buffer gnus-summary-buffer)
           mime/default-coding-system)))
     (mime/viewer-mode nil nil nil gnus-original-article-buffer
-                     gnus-article-buffer)
+                     gnus-article-buffer
+                     gnus-article-mode-map)
     )
   (setq tm-gnus/automatic-mime-preview t)
   (run-hooks 'tm-gnus/article-prepare-hook)

diff --git a/tm-bbdb.el b/tm-bbdb.el
index cf0ac19..253c1b6 100644 (file)
--- a/tm-bbdb.el
+++ b/tm-bbdb.el
@@ -8,7 +8,7 @@
 ;;;         Artur Pioro <artur@flugor.if.uj.edu.pl>
 ;;; modified by Pekka Marjola <pema@iki.fi>
 ;;; Maintainer: KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
-;;; Version: $Id: tm-bbdb.el,v 7.9 1996/05/23 16:42:14 shuhei-k Exp $
+;;; Version: $Id: tm-bbdb.el,v 7.10 1996/07/01 23:43:25 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, BBDB
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -193,8 +193,13 @@ displaying the record corresponding to the sender of the current message."
       (set-buffer b)
       record)))
 
-(define-key mime/viewer-mode-map ";" 'tm-bbdb/edit-notes)
-(define-key mime/viewer-mode-map ":" 'tm-bbdb/show-sender)
+(defun tm-bbdb/define-keys ()
+  (let ((mime/viewer-mode-map (current-local-map)))
+    (define-key mime/viewer-mode-map ";" 'tm-bbdb/edit-notes)
+    (define-key mime/viewer-mode-map ":" 'tm-bbdb/show-sender)
+    ))
+
+(add-hook 'mime-viewer/define-keymap-hook 'tm-bbdb/define-keys)
 
 
 ;;; @ for signature.el

diff --git a/tm-def.el b/tm-def.el
index 18d19b1..d074951 100644 (file)
--- a/tm-def.el
+++ b/tm-def.el
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-def.el,v 7.46 1996/06/26 15:32:13 morioka Exp $
+;;;    $Id: tm-def.el,v 7.47 1996/07/04 16:57:03 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, definition
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -283,16 +283,17 @@
 (defun tm:button-dispatcher (event)
   "Select the button under point."
   (interactive "e")
-  (mouse-set-point event)
-  (let ((func (get-text-property (point) 'tm-callback))
-       (data (get-text-property (point) 'tm-data))
-       )
-    (if func
-       (apply func data)
-      (if (fboundp tm:mother-button-dispatcher)
-         (funcall tm:mother-button-dispatcher event)
-       )
-      )))
+  (save-window-excursion
+    (mouse-set-point event)
+    (let ((func (get-text-property (point) 'tm-callback))
+         (data (get-text-property (point) 'tm-data))
+         )
+      (if func
+         (apply func data)
+       (if (fboundp tm:mother-button-dispatcher)
+           (funcall tm:mother-button-dispatcher event)
+         )
+       ))))
 
 
 ;;; @ for URL

diff --git a/tm-edit.el b/tm-edit.el
index 86cc55a..8e7334f 100644 (file)
--- a/tm-edit.el
+++ b/tm-edit.el
@@ -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.69 $
+;;; Version: $Revision: 7.70 $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -122,7 +122,7 @@
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.69 1996/06/27 14:22:59 morioka Exp $")
+  "$Id: tm-edit.el,v 7.70 1996/07/09 13:30:32 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -501,6 +501,8 @@ Tspecials means any character that matches with it in header must be quoted.")
 (defconst mime-editor/mime-map (make-sparse-keymap)
   "Keymap for MIME commands.")
 
+(defconst mime-editor/minor-mime-map nil
+  "Keymap for MIME commands.")
 
 ;;; @ keymap and menu
 ;;;
@@ -508,10 +510,6 @@ Tspecials means any character that matches with it in header must be quoted.")
 (defvar mime/editor-mode-flag nil)
 (make-variable-buffer-local 'mime/editor-mode-flag)
 
-(set-alist 'minor-mode-alist
-          'mime/editor-mode-flag
-          '((" MIME-Edit "  mime-editor/transfer-level-string)))
-
 (defun mime-editor/define-keymap (keymap)
   "Add mime-editor commands to KEYMAP."
   (if (not (keymapp keymap))
@@ -539,6 +537,29 @@ Tspecials means any character that matches with it in header must be quoted.")
 
 (mime-editor/define-keymap mime-editor/mime-map)
 
+(if mime-editor/minor-mime-map
+    ()
+  (setq mime-editor/minor-mime-map 
+       (make-sparse-keymap 'mime-editor/minor-mime-map))
+  (define-key mime-editor/minor-mime-map mime-prefix mime-editor/mime-map))
+
+(defun mime-editor/toggle-mode ()
+  (interactive)
+  (if mime/editor-mode-flag
+      (mime-editor/exit 'nomime)
+    (mime/editor-mode)
+    ))
+
+(if running-xemacs
+    (add-minor-mode 'mime/editor-mode-flag
+                   '((" MIME-Edit "  mime-editor/transfer-level-string))
+                   mime-editor/minor-mime-map
+                   nil
+                   'mime-editor/toggle-mode)
+  (set-alist 'minor-mode-alist
+            'mime/editor-mode-flag
+            '((" MIME-Edit "  mime-editor/transfer-level-string))))
+
 (defconst mime-editor/menu-title "MIME-Edit")
 
 (defconst mime-editor/menu-list
@@ -791,10 +812,6 @@ just return to previous mode."
     ;; Restore previous state.
     (setq mime/editor-mode-flag nil)
     (cond (running-xemacs
-          ;; mime-prefix only defined if binding was nil
-          (if (eq (lookup-key (current-local-map) mime-prefix)
-                  mime-editor/mime-map)
-              (define-key (current-local-map) mime-prefix nil))
           (delete-menu-item (list mime-editor/menu-title)))
          (t
           (use-local-map mime/editor-mode-old-local-map)))

diff --git a/tm-image.el b/tm-image.el
index c9001ea..7dc7228 100644 (file)
--- a/tm-image.el
+++ b/tm-image.el
@@ -10,7 +10,7 @@
 ;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Created: 1995/12/15
 ;;; Version:
-;;;    $Id: tm-image.el,v 7.8 1996/06/12 05:22:11 morioka Exp $
+;;;    $Id: tm-image.el,v 7.9 1996/07/08 05:44:22 morioka Exp $
 ;;;
 ;;; Keywords: mail, news, MIME, multimedia, image, picture
 ;;;
@@ -31,16 +31,14 @@
 ;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 ;;;
 ;;; Commentary:
-;;;   If you use this program with Mule, please install bitmap
-;;;   extension package. It is available from
-;;;    ftp://etlport.etl.go.jp/pub/mule/contrib/bitmap.tar.gz
+;;;   If you use this program with Mule, please install
+;;;   etl8x16-bitmap.bdf font included in tl package.
 ;;;
 ;;; Code:
 
 (require 'tm-view)
 
 (cond (running-xemacs
-       (require 'xpm)
        (require 'annotations)
        
        (set-alist 'mime-viewer/content-filter-alist

diff --git a/tm-view.el b/tm-view.el
index 30b5bd1..1cb26da 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -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.65 $
+;;; Version: $Revision: 7.66 $
 ;;; 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.65 1996/05/23 16:45:10 shuhei-k Exp $")
+  "$Id: tm-view.el,v 7.66 1996/07/01 23:42:12 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -680,87 +680,94 @@ The compressed face will be piped to this command.")
     )
   "Menu for MIME Viewer")
 
-(defvar mime/viewer-mode-map nil)
-(if (null mime/viewer-mode-map)
+(if running-xemacs
     (progn
-      (setq mime/viewer-mode-map (make-keymap))
-      (suppress-keymap mime/viewer-mode-map)
-      (define-key mime/viewer-mode-map
-       "u"        (function mime-viewer/up-content))
-      (define-key mime/viewer-mode-map
-       "p"        (function mime-viewer/previous-content))
-      (define-key mime/viewer-mode-map
-       "n"        (function mime-viewer/next-content))
-      (define-key mime/viewer-mode-map
-       " "        (function mime-viewer/scroll-up-content))
-      (define-key mime/viewer-mode-map
-       "\M- "     (function mime-viewer/scroll-down-content))
-      (define-key mime/viewer-mode-map
-       "\177"     (function mime-viewer/scroll-down-content))
-      (define-key mime/viewer-mode-map
-       "\C-m"     (function mime-viewer/next-line-content))
-      (define-key mime/viewer-mode-map
-       "\C-\M-m"  (function mime-viewer/previous-line-content))
-      (define-key mime/viewer-mode-map
-       "v"        (function mime-viewer/play-content))
-      (define-key mime/viewer-mode-map
-       "e"        (function mime-viewer/extract-content))
-      (define-key mime/viewer-mode-map
-       "\C-c\C-p" (function mime-viewer/print-content))
-      (define-key mime/viewer-mode-map
-       "x"        (function mime-viewer/display-x-face))
-      (define-key mime/viewer-mode-map
-       "a"        (function mime-viewer/follow-content))
-      (define-key mime/viewer-mode-map
-       "q"        (function mime-viewer/quit))
-      (define-key mime/viewer-mode-map
-       "h"        (function mime-viewer/show-summary))
-      (define-key mime/viewer-mode-map
-       "\C-c\C-x" (function mime-viewer/kill-buffer))
-      (define-key mime/viewer-mode-map
-        "<"        (function beginning-of-buffer))
-      (define-key mime/viewer-mode-map
-        ">"        (function end-of-buffer))
-      (define-key mime/viewer-mode-map
-        "?"        (function describe-mode))
-      (if mouse-button-2
-         (define-key mime/viewer-mode-map
-           mouse-button-2 (function tm:button-dispatcher))
-       )
-      (cond (running-xemacs
-            (defvar mime-viewer/xemacs-popup-menu
-              (cons mime-viewer/menu-title
-                    (mapcar (function
-                             (lambda (item)
-                               (vector (nth 1 item)(nth 2 item) t)
-                               ))
-                            mime-viewer/menu-list)))
-            (defun mime-viewer/xemacs-popup-menu (event)
-              "Popup the menu in the MIME Viewer buffer"
-              (interactive "e")
-              (select-window (event-window event))
-              (set-buffer (event-buffer event))
-              (popup-menu 'mime-viewer/xemacs-popup-menu))
-            (define-key mime/viewer-mode-map
-              mouse-button-3 (function mime-viewer/xemacs-popup-menu))
-            )
-           ((>= emacs-major-version 19)
-            (define-key mime/viewer-mode-map [menu-bar mime-view]
-              (cons mime-viewer/menu-title
-                    (make-sparse-keymap mime-viewer/menu-title)))
-            (mapcar (function
-                     (lambda (item)
-                       (define-key mime/viewer-mode-map
-                         (vector 'menu-bar 'mime-view (car item))
-                         (cons (nth 1 item)(nth 2 item))
-                         )
-                       ))
-                    (reverse mime-viewer/menu-list)
-                    )
-            ))
+      (defvar mime-viewer/xemacs-popup-menu
+       (cons mime-viewer/menu-title
+             (mapcar (function
+                      (lambda (item)
+                        (vector (nth 1 item)(nth 2 item) t)
+                        ))
+                     mime-viewer/menu-list)))
+      (defun mime-viewer/xemacs-popup-menu (event)
+       "Popup the menu in the MIME Viewer buffer"
+       (interactive "e")
+       (select-window (event-window event))
+       (set-buffer (event-buffer event))
+       (popup-menu 'mime-viewer/xemacs-popup-menu))
       ))
 
-(defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf)
+(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)
+    (define-key mime/viewer-mode-map
+      "u"        (function mime-viewer/up-content))
+    (define-key mime/viewer-mode-map
+      "p"        (function mime-viewer/previous-content))
+    (define-key mime/viewer-mode-map
+      "n"        (function mime-viewer/next-content))
+    (define-key mime/viewer-mode-map
+      " "        (function mime-viewer/scroll-up-content))
+    (define-key mime/viewer-mode-map
+      "\M- "     (function mime-viewer/scroll-down-content))
+    (define-key mime/viewer-mode-map
+      "\177"     (function mime-viewer/scroll-down-content))
+    (define-key mime/viewer-mode-map
+      "\C-m"     (function mime-viewer/next-line-content))
+    (define-key mime/viewer-mode-map
+      "\C-\M-m"  (function mime-viewer/previous-line-content))
+    (define-key mime/viewer-mode-map
+      "v"        (function mime-viewer/play-content))
+    (define-key mime/viewer-mode-map
+      "e"         (function mime-viewer/extract-content))
+    (define-key mime/viewer-mode-map
+      "\C-c\C-p" (function mime-viewer/print-content))
+    (define-key mime/viewer-mode-map
+      "x"        (function mime-viewer/display-x-face))
+    (define-key mime/viewer-mode-map
+      "a"        (function mime-viewer/follow-content))
+    (define-key mime/viewer-mode-map
+      "q"        (function mime-viewer/quit))
+    (define-key mime/viewer-mode-map
+      "h"        (function mime-viewer/show-summary))
+    (define-key mime/viewer-mode-map
+      "\C-c\C-x" (function mime-viewer/kill-buffer))
+    (define-key mime/viewer-mode-map
+      "<"        (function beginning-of-buffer))
+    (define-key mime/viewer-mode-map
+      ">"        (function end-of-buffer))
+    (define-key mime/viewer-mode-map
+      "?"        (function describe-mode))
+    (if mouse-button-2
+       (define-key mime/viewer-mode-map
+         mouse-button-2 (function tm:button-dispatcher))
+      )
+    (cond (running-xemacs
+          (define-key mime/viewer-mode-map
+            mouse-button-3 (function mime-viewer/xemacs-popup-menu))
+          )
+         ((>= emacs-major-version 19)
+          (define-key mime/viewer-mode-map [menu-bar mime-view]
+            (cons mime-viewer/menu-title
+                  (make-sparse-keymap mime-viewer/menu-title)))
+          (mapcar (function
+                   (lambda (item)
+                     (define-key mime/viewer-mode-map
+                       (vector 'menu-bar 'mime-view (car item))
+                       (cons (nth 1 item)(nth 2 item))
+                       )
+                     ))
+                  (reverse mime-viewer/menu-list)
+                  )
+          ))
+    (use-local-map mime/viewer-mode-map)
+    (run-hooks 'mime-viewer/define-keymap-hook)
+    ))
+
+(defun mime/viewer-mode (&optional mother ctl encoding ibuf obuf
+                                  mother-keymap)
   "Major mode for viewing MIME message.
 
 Here is a list of the standard keys for mime/viewer-mode.
@@ -784,12 +791,6 @@ x          Display X-Face
 q              Quit
 button-2       Move to point under the mouse cursor
                and decode current content as `play mode'
-
-
-Here are all the commands with their current binding,
-listed in key order:
-
-\\{mime/viewer-mode-map}
 "
   (interactive)
   (let ((buf (get-buffer mime/output-buffer-name)))
@@ -808,7 +809,7 @@ listed in key order:
          (progn
            (setq mime::preview/mother-buffer mother)
            ))
-      (use-local-map mime/viewer-mode-map)
+      (mime-viewer/define-keymap mother-keymap)
       (setq mime::preview/content-list (nth 1 ret))
       (goto-char
        (let ((ce (mime::preview-content-info/point-max