tm 6.80.

diff --git a/Changes-6.80.en b/Changes-6.80.en
new file mode 100644 (file)
index 0000000..aa9c902
--- /dev/null
+++ b/Changes-6.80.en
@@ -0,0 +1,32 @@
+* tl
+
+  Attached version 6.6.3.
+
+----------------------------
+revision 3.0
+date: 1995/09/10 13:31:51;  author: morioka;  state: Exp;  lines: +20 -19
+Emacs 19 emulating functions were deleted.
+----------------------------
+
+* tm
+
+tm/tinyrich.el
+----------------------------
+revision 4.0
+date: 1995/09/10 13:35:41;  author: morioka;  state: Exp;  lines: +10 -2
+Definition for XEmacs were added.
+----------------------------
+
+tm/tm-setup.el
+----------------------------
+revision 6.3
+date: 1995/09/10 15:45:42;  author: morioka;  state: Exp;  lines: +23 -17
+Setting for tm-rich was added.
+----------------------------
+
+tm/tm-view.el
+----------------------------
+revision 6.80
+date: 1995/09/09 08:54:54;  author: morioka;  state: Exp;  lines: +26 -13
+Document string of function `mime/viewer-mode' was fixed.
+----------------------------

diff --git a/Changes-6.80.ja b/Changes-6.80.ja
new file mode 100644 (file)
index 0000000..964b2c1
--- /dev/null
+++ b/Changes-6.80.ja
@@ -0,0 +1,32 @@
+* tl
+
+  Version 6.6.3 \e$B$rE:IU$7$?!#\e(B
+
+----------------------------
+revision 3.0
+date: 1995/09/10 13:31:51;  author: morioka;  state: Exp;  lines: +20 -19
+Emacs 19 \e$B$HF1L>$N4X?t$rDj5A$9$k$N$O$d$a$?!#\e(B
+----------------------------
+
+* tm
+
+tm/tinyrich.el
+----------------------------
+revision 4.0
+date: 1995/09/10 13:35:41;  author: morioka;  state: Exp;  lines: +10 -2
+XEmacs \e$BMQ$NDj5A$rDI2C$7$?!#\e(B
+----------------------------
+
+tm/tm-setup.el
+----------------------------
+revision 6.3
+date: 1995/09/10 15:45:42;  author: morioka;  state: Exp;  lines: +23 -17
+tm-rich \e$B$N@_Dj$r9T$J$C$?!#\e(B
+----------------------------
+
+tm/tm-view.el
+----------------------------
+revision 6.80
+date: 1995/09/09 08:54:54;  author: morioka;  state: Exp;  lines: +26 -13
+\e$B4X?t\e(B mime/viewer-mode \e$B$N\e(B document string \e$B$r=$@5$7$?!#\e(B
+----------------------------

diff --git a/Makefile b/Makefile
index dfa721b..b96c5ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ TL_FILES = tl/README.eng tl/Makefile tl/mk-tl tl/*.el tl/doc/*.texi
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm6.79.tar
+TARFILE = tm6.80.tar
 
 
 nemacs:

diff --git a/mk-tm b/mk-tm
index f4614f3..4d49728 100644 (file)
--- a/mk-tm
+++ b/mk-tm
@@ -34,15 +34,13 @@
          "tm-rmail" "tm-comp"
          "tm-setup" "mime-setup"
          ))
-       (if (not (string-match "\\(XEmacs\\|Lucid\\)" emacs-version))
-          (progn
-            (cons
-             (if (or (< emacs-major-version 19)(< emacs-minor-version 29))
-                 "tinyrich"
-               "richtext"
-               )
-             '("tm-rich")
-             )))
+       (cons
+       (if (or (< emacs-major-version 19)(< emacs-minor-version 29))
+           "tinyrich"
+         "richtext"
+         )
+       '("tm-rich")
+       )
        ))
 
 (setq tm-uncompile-el-files '("tm-partial.el"))

diff --git a/tinyrich.el b/tinyrich.el
index fa2ef0a..7e26937 100644 (file)
--- a/tinyrich.el
+++ b/tinyrich.el
@@ -1,5 +1,5 @@
 ;;;
-;;; $Id: tinyrich.el,v 3.0 1995/09/08 17:29:38 morioka Exp $
+;;; $Id: tinyrich.el,v 4.0 1995/09/10 13:35:41 morioka Exp $
 ;;;
 ;;;          by MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 ;;; modified by YAMATE Keiichirou <ics9118@sem1.info.osaka-cu.ac.jp>
@@ -8,7 +8,15 @@
 (defvar mime/text/enriched-face-list
   '("bold" "italic" "fixed" "underline"))
 
-(cond ((and (>= emacs-major-version 19) window-system)
+(cond ((string-match "XEmacs\\|Lucid" emacs-version)
+       (defun mime/set-face-region (b e face)
+        (let ((sym (intern face)))
+          (if (member sym (face-list))
+              (let ((overlay (make-extent b e)))
+                (set-extent-property overlay 'face sym)
+                ))))
+       )
+      ((and (>= emacs-major-version 19) window-system)
        (defun mime/set-face-region (b e face)
         (let ((sym (intern face)))
           (if (member sym (face-list))

diff --git a/tm-setup.el b/tm-setup.el
index 73c24a7..50b359b 100644 (file)
--- a/tm-setup.el
+++ b/tm-setup.el
@@ -1,12 +1,13 @@
 ;;;
-;;; $Id: tm-setup.el,v 6.2 1995/05/30 05:48:22 morioka Exp $
+;;; $Id: tm-setup.el,v 6.3 1995/09/10 15:45:42 morioka Exp $
 ;;;
 
 (require 'tl-misc)
 
 
-;;; @ for LaTeX
+;;; @ for tm-view
 ;;;
+
 (call-after-loaded
  'tm-view
  (function
@@ -14,6 +15,24 @@
     ;; for message/partial
     (require 'tm-partial)
     
+    ;; for anonymous ftp
+    (set-atype 'mime/content-decoding-condition
+              '((type . "message/external-body")
+                ("access-type" . "anon-ftp")
+                (method . mime/decode-message/external-ftp)
+                ))
+    (autoload 'mime/decode-message/external-ftp "tm-ftp")
+
+    ;; for text/richtext
+    (set-alist 'mime-viewer/content-filter-alist
+              "text/richtext" (function mime-viewer/filter-text/richtext))
+    (autoload 'mime-viewer/filter-text/richtext "tm-rich")
+
+    ;; for text/enriched
+    (set-alist 'mime-viewer/content-filter-alist
+              "text/enriched" (function mime-viewer/filter-text/enriched))
+    (autoload 'mime-viewer/filter-text/enriched "tm-rich")
+    
     ;; for LaTeX
     (set-atype 'mime/content-decoding-condition
               '((type . "text/x-latex")
@@ -32,28 +51,15 @@
     )))
 
 
-;;; @ for Anonymous FTP (need of ange-ftp)
-;;;
-(call-after-loaded
- 'tm-view
- (function
-  (lambda ()
-    (set-atype 'mime/content-decoding-condition
-              '((type . "message/external-body")
-                ("access-type" . "anon-ftp")
-                (method . mime/decode-message/external-ftp)
-                ))
-    (autoload 'mime/decode-message/external-ftp "tm-ftp")
-    )))
-
-
 ;;; @ for RMAIL
 ;;;
+
 (require 'tm-rmail)
 
 
 ;;; @ for mh-e
 ;;;
+
 (let ((le (function
           (lambda ()
             (require 'tm-mh-e)

diff --git a/tm-view.el b/tm-view.el
index 8aa7f0b..8f1cf53 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -21,7 +21,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.79 1995/09/08 14:50:03 morioka Exp $")
+  "$Id: tm-view.el,v 6.80 1995/09/09 08:54:54 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -973,18 +973,31 @@ it is regarded as current-buffer. [tm-view]"
 (defun mime/viewer-mode (&optional mother ctl encoding)
   "Major mode for viewing MIME message.
 
-u      Move to upper content
-p      Move to previous content
-n      Move to next content
-SPC    Scroll up
-M-SPC  Scroll down
-DEL    Scroll down
-RET    Move to next line
-M-RET  Move to previous line
-v      Decode the content as `play mode'
-e      Decode the content as `extract mode'
-C-c C-p        Decode the content as `print mode'
-q      Quit
+Here is a list of the standard keys for mime/viewer-mode.
+
+key            feature
+---            -------
+
+u              Move to upper content
+p              Move to previous content
+n              Move to next content
+SPC            Scroll up or move to next content
+M-SPC          Scroll down or move to previous content
+DEL            Scroll down or move to previous content
+RET            Move to next line
+M-RET          Move to previous line
+v              Decode current content as `play mode'
+e              Decode current content as `extract mode'
+C-c C-p                Decode current content as `print mode'
+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)
   (setq mime-viewer/ignored-field-regexp