tm 7.47.
authormorioka <morioka>
Mon, 9 Mar 1998 16:08:53 +0000 (16:08 +0000)
committermorioka <morioka>
Mon, 9 Mar 1998 16:08:53 +0000 (16:08 +0000)
ChangeLog
Makefile
README.en
TM-CFG [new file with mode: 0644]
TM-ELS [new file with mode: 0644]
inst-tm
mh-e/ChangeLog
mh-e/Makefile
mh-e/tm-mh-e.el
tm-def.el
tm-edit.el

index 0a2d4f3..9c558b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,96 @@
+Wed Mar  6 02:12:36 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tl: Version 7.15 was released.
+       * tm: Version 7.47 was released.
+       * tm/mh-e: Version 7.56 was released.
+
+       * README.en: tm-cfg was renamed to TM-CFG.
+
+       * inst-tm: tm-cfg was renamed to TM-CFG.
+
+       * inst-tm: tm-els was renamed to TM-ELS.
+
+Tue Mar  5 23:19:05 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el: Function `replace-space-with-underline' was moved to
+       tl-str.el.
+
+       * tm-edit.el (mime-editor/transfer-level): changed to buffer local
+       variable.
+       (mime-editor/transfer-level-string): changed to buffer local
+       variable.
+       (mime-editor/charset-default-encoding-alist): changed to buffer
+       local variable.
+
+Tue Mar  5 21:22:46 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime-editor/toggle-transfer-level): Function
+       `mime-editor/text-toggle-transfer-level' was renamed to
+       `mime-editor/toggle-transfer-level'.
+
+Tue Mar  5 21:19:21 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime-editor/transfer-level,
+       mime-editor/text-toggle-transfer-level, mime/editor-mode):
+       Variable `mime/default-transfer-level' was renamed to
+       `mime-editor/transfer-level'.
+
+Tue Mar  5 21:13:58 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime/default-transfer-level): moved from tm-edit.el.
+
+       * tm-def.el: Variable `mime/default-transfer-level' was moved to
+       tm-edit.el.
+
+       * tm-edit.el (mime-editor/text-toggle-transfer-level,
+       mime-editor/menu-list): Function
+       `mime-editor/text-toggle-transfer-level' was renamed to
+       `mime-editor/text-toggle-transfer-level'.
+
+Tue Mar  5 21:00:07 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime-editor/transfer-level-string,
+       mime/text-toggle-transfer-level, mime/editor-mode): use function
+       `mime/encoding-name'.
+
+       * tm-def.el (mime/encoding-name): add optional argument `not-omit'.
+
+       * tm-edit.el (mime-editor/transfer-level-string,
+       mime/text-toggle-transfer-level, `mime/editor-mode-flag' of
+       `minor-mode-alist', mime/editor-mode): Variable
+       `mime/trlevel-string' was renamed to
+       `mime-editor/transfer-level-string'.
+
+Tue Mar  5 20:42:24 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime-editor/charset-default-encoding-alist,
+       mime/text-toggle-transfer-level, mime-editor/normalize-body):
+       Variable `mime/charset-default-encoding-alist' was renamed to
+       `mime-editor/charset-default-encoding-alist'.
+
+Tue Mar  5 20:34:27 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-edit.el (mime/charset-default-encoding-alist):
+       moved from tm-def.el.
+       (mime/trlevel-string): moved from tm-def.el.
+       (mime/text-toggle-transfer-level): moved from tm-def.el.
+
+       * tm-def.el (mime/charset-default-encoding-alist):
+       moved to tm-edit.el.
+       (mime/trlevel-string): moved to tm-edit.el.
+       (mime/text-toggle-transfer-level): moved to tm-edit.el.
+
+       * tm-def.el (mime/trlevel-string): Initial value was modified.
+
+Tue Mar  5 07:52:39 1996  Steinar Bang <sb@metis.no>
+
+       * tm-def.el (mime/trlevel-string): New variable.
+
+       * tm-edit.el (mime-editor/menu-list): add
+       `mime/text-toggle-transfer-level'.
+       (mime/editor-mode): modified for transfer-level.
+
+\f
 Mon Mar  4 09:24:23 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.14 was released.
index 6bd3fd5..4a4531c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ GOMI  = $(BINS) *.elc loadpath
 FLAGS   = -batch -q -no-site-file
 
 TM_FILES = tm/README.en tm/ChangeLog \
-               tm/Makefile tm/inst-tm tm/tm-els tm/tm-cfg \
+               tm/Makefile tm/inst-tm tm/TM-ELS tm/TM-CFG \
                tm/tm-mule.el tm/tm-nemacs.el tm/tm-orig.el tm/tm-def.el \
                tm/tm-eword.el tm/tm-ew-d.el tm/tm-ew-e.el \
                tm/tm-view.el tm/tm-parse.el \
@@ -45,7 +45,7 @@ TL_FILES = tl/README.en tl/Makefile tl/mk-tl tl/tl-els tl/*.el \
 
 FILES  = $(TM_FILES) $(TM_MUA_FILES) $(MEL_FILES) $(TL_FILES)
 
-TARFILE = tm7.46.1.tar.gz
+TARFILE = tm7.47.tar.gz
 
 elc:
        $(EMACS) $(FLAGS) -l inst-tm -f compile-tm
index 6e57f45..9cd6991 100644 (file)
--- a/README.en
+++ b/README.en
@@ -1,7 +1,7 @@
 [README for tm (English Version)]
 by MORIOKA Tomohiko <morioka@jaist.ac.jp>
 and KOBAYASHI Shuhei <shuhei@cmpt01.phys.tohoku.ac.jp>
-$Id: README.en,v 7.14 1996/03/04 09:08:40 morioka Exp $
+$Id: README.en,v 7.15 1996/03/06 02:12:36 morioka Exp $
 
 1 What's tm?
 
@@ -69,9 +69,9 @@ $Id: README.en,v 7.14 1996/03/04 09:08:40 morioka Exp $
 
 4 Install
 
-4.1 edit tm/tm-cfg (optional)
+4.1 edit tm/TM-CFG (optional)
 
-  You can edit tm/tm-cfg file.
+  You can edit tm/TM-CFG file.
 
   In default, tm is installed into your home directory. If you want to 
 install into /usr/local/, please modify the variable `PREFIX'.
diff --git a/TM-CFG b/TM-CFG
new file mode 100644 (file)
index 0000000..5a0a477
--- /dev/null
+++ b/TM-CFG
@@ -0,0 +1,88 @@
+;;; -*-Emacs-Lisp-*-
+;;;
+;;; $Id: TM-CFG,v 1.1 1996/03/04 08:37:01 morioka Exp morioka $
+;;;
+
+(setq load-path (append
+                (mapcar (function
+                         (lambda (path)
+                           (expand-file-name path (getenv "PWD"))
+                           ))
+                        '("." "../tl/" "../mel/" "mh-e/")
+                        )
+                load-path))
+
+(require 'tl-misc)
+
+
+;; Please specify VM path.
+(add-path "vm-5.95beta/" 'all-paths)
+
+;; Please specify Mailcrypt path.
+(add-path "mailcrypt-3.4/" 'all-paths)
+
+;; Please specify BBDB path.
+(add-path "bbdb-1.50/" 'all-paths)
+
+;; Please specify shell command path.
+(setq SHELL "/bin/sh")
+
+;; Please specify install path prefix.
+(setq PREFIX "~/")
+;;(setq PREFIX "/usr/local/")
+
+(setq EMACS_PREFIX
+      (cond ((boundp 'NEMACS) "nemacs/")
+           ((boundp 'MULE)   "mule/")
+           ((string-match "XEmacs" emacs-version) "xemacs/")
+           (t "emacs/")
+           ))
+
+(setq DATA_PREFIX
+      (if (or (< emacs-major-version 19)
+             (< emacs-minor-version 29)
+             )
+         "lib/"
+       "share/"))
+
+(setq DATADIR (expand-file-name DATA_PREFIX PREFIX))
+
+(setq LISP_PREFIX
+      (if (>= emacs-major-version 19)
+         "site-lisp/"
+       "local.lisp/"))
+
+(setq EMACS_DATADIR (expand-file-name EMACS_PREFIX DATADIR))
+
+(setq LISPDIR (expand-file-name LISP_PREFIX EMACS_DATADIR))
+
+
+;; Please specify mime-setup.{el|elc} install path.
+(setq SETUP_FILE_DIR LISPDIR)
+
+
+(setq TM_PREFIX "")
+
+(setq TM_LISPDIR (expand-file-name TM_PREFIX LISPDIR))
+
+(setq TL_DIR (expand-file-name "tl/" TM_LISPDIR))
+(setq MEL_DIR (expand-file-name "mel/" TM_LISPDIR))
+(setq TM_KERNEL_DIR (expand-file-name "tm/" TM_LISPDIR))
+(setq TM_MHE_DIR TM_KERNEL_DIR)
+(setq TM_GNUS_DIR TM_KERNEL_DIR)
+
+
+(setq el-file-mode (+ (* 64 6)(* 8 4) 4))
+
+
+(setq BINS '("src/ol2" "src/decode-b"))
+(setq METHODS
+      '("tm-au" "tm-file" "tm-html" "tm-image" "tm-mpeg" "tm-plain"
+       "tmdecode"))
+
+
+;; Please specify binary path.
+(setq BIN_DIR (expand-file-name "bin/" PREFIX))
+
+;; Please specify binary path.
+(setq METHOD_DIR BIN_DIR)
diff --git a/TM-ELS b/TM-ELS
new file mode 100644 (file)
index 0000000..d1b19a6
--- /dev/null
+++ b/TM-ELS
@@ -0,0 +1,99 @@
+;;; -*-Emacs-Lisp-*-
+;;;
+;;; $Id: TM-ELS,v 1.2 1996/03/04 08:57:38 morioka Exp $
+;;;
+
+(require 'tl-misc)
+
+(setq tm-modules
+      (cons
+       (cond ((boundp 'NEMACS)
+             "tm-nemacs"
+             )
+            ((boundp 'MULE)
+             "tm-mule"
+             )
+            (t
+             "tm-orig"
+             ))
+       '("signature"
+        "tm-def"
+        "tm-ew-d" "tm-parse" "tm-view" "tm-play" "tm-partial"
+        "tm-rich"
+        "tm-latex" "tm-html" "tm-tar" "tm-file"
+        "tm-ew-e"
+        "tm-edit"
+        "tm-rmail" "tm-mail"
+        "tm-setup"
+        )))
+
+(setq tm-uncompile-el-files '("sc-setup.el"))
+
+(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 (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")))
+  )
+
+(if (file-installed-p "mailcrypt.el")
+    (setq tm-modules (append tm-modules '("tm-pgp")))
+  (setq tm-uncompile-el-files
+       (append tm-uncompile-el-files '("tm-pgp.el")))
+  )
+
+(if (file-installed-p "bbdb.el")
+    (setq tm-modules (append tm-modules '("tm-bbdb")))
+  (setq tm-uncompile-el-files
+       (append tm-uncompile-el-files '("tm-bbdb.el")))
+  )
+
+(if (and (file-exists-p "tm-evs.el")
+        (or (boundp 'MULE)
+            (boundp 'NEMACS))
+        )
+    (setq tm-modules (append tm-modules '("tm-evs")))
+  )
+
+(if (string-match "XEmacs" emacs-version)
+    (setq tm-modules (append tm-modules '("tm-image")))
+  (if (boundp 'MULE)
+      (if (file-installed-p "bitmap.el")
+         (setq tm-modules (append tm-modules '("tm-image")))
+       (setq tm-uncompile-el-files
+             (append tm-uncompile-el-files '("tm-image.el")))
+       )))
+
+(setq tm-el-files
+      (append
+       (mapcar (function (lambda (module)
+                          (concat module ".el")
+                          ))
+              tm-modules)
+       tm-uncompile-el-files))
+
+(setq tm-elc-files
+      (mapcar (function (lambda (module)
+                         (concat module ".elc")
+                         ))
+             tm-modules))
+
+
+(setq setup-modules '("mime-setup"))
+
+(setq setup-el-files
+      (mapcar (function (lambda (module)
+                         (concat module ".el")
+                         ))
+             setup-modules))
+
+(setq setup-elc-files
+      (mapcar (function (lambda (module)
+                         (concat module ".elc")
+                         ))
+             setup-modules))
diff --git a/inst-tm b/inst-tm
index 9f58172..f035221 100644 (file)
--- a/inst-tm
+++ b/inst-tm
@@ -1,12 +1,12 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: inst-tm,v 1.2 1996/03/04 09:39:25 morioka Exp $
+;;; $Id: inst-tm,v 2.1 1996/03/06 02:10:32 morioka Exp $
 ;;;
 
-(load-file "tm-cfg")
+(load-file "TM-CFG")
 (load-file "../tl/tl-els")
 (load-file "../mel/mel-els")
-(load-file "tm-els")
+(load-file "TM-ELS")
 (load-file "mh-e/tmh-els")
 
 (defun make-mime-setup (tl-path mel-path tm-path)
index 916ccd2..fdfeeb5 100644 (file)
@@ -1,3 +1,11 @@
+Wed Mar  6 02:03:17 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm/mh-e: Version 7.56 was released.
+
+       * tm-mh-e.el: Function `tm-mh-e/set-window-configuration' was
+       commented out. (cf. [tm-en:359])
+
+\f
 Mon Mar  4 09:22:37 1996  Morioka Tomohiko  <morioka@jaist.ac.jp>
 
        * tm/mh-e: Version 7.55 was released.
index 13308ed..ba06d3a 100644 (file)
@@ -24,7 +24,7 @@ TMDIR19       = $(HOME)/lib/emacs19/lisp
 
 
 FILES  = tm/mh-e/*.el tm/mh-e/Makefile tm/mh-e/mk-tmh tm/mh-e/*.ol
-TARFILE = tm-mh-e7.55.tar
+TARFILE = tm-mh-e7.56.tar
 
 
 elc:
index 551d900..e9114a3 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.55 $
+;;; Version: $Revision: 7.56 $
 ;;; 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.55 1996/02/29 15:23:53 morioka Exp $")
+  "$Id: tm-mh-e.el,v 7.56 1996/03/06 02:03:17 morioka Exp $")
 
 (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID))
 
@@ -289,14 +289,14 @@ digest are inserted into the folder after that message."
           'mh-show-mode
           (function tm-mh-e/quitting-method))
 
-(defun tm-mh-e/set-window-configuration ()
-  (save-excursion
-    (set-buffer mh-show-buffer)
-    (setq mime::preview/original-window-configuration
-         (current-window-configuration))
-    ))
+;; (defun tm-mh-e/set-window-configuration ()
+;;   (save-excursion
+;;     (set-buffer mh-show-buffer)
+;;     (setq mime::preview/original-window-configuration
+;;           (current-window-configuration))
+;;     ))
 
-(add-hook 'mh-show-hook 'tm-mh-e/set-window-configuration)
+;; (add-hook 'mh-show-hook 'tm-mh-e/set-window-configuration)
 
 
 ;;; @@ for tm-partial
index 997ce04..d57ee5f 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.15 1996/02/06 02:43:06 morioka Exp $
+;;;    $Id: tm-def.el,v 7.20 1996/03/05 21:12:40 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, definition
 ;;;
 ;;; This file is part of tm (Tools for MIME).
     ("ISO-2022-INT-1" 7 "base64")
     ))
 
-(defun mime/encoding-name (transfer-level)
+(defun mime/encoding-name (transfer-level &optional not-omit)
   (cond ((> transfer-level 8) "binary")
        ((= transfer-level 8) "8bit")
+       (not-omit "7bit")
        ))
 
 (defun mime/make-charset-default-encoding-alist (transfer-level)
                 ))))
          mime/charset-type-list))
 
-(defvar mime/default-transfer-level 7
-  "*A number of network transfer level. It should be 7 or 8.")
-
-(defvar mime/charset-default-encoding-alist
-  (mime/make-charset-default-encoding-alist mime/default-transfer-level))
-
-(defun mime/text-toggle-transfer-level (&optional transfer-level)
-  "Toggle transfer-level is 7bit or 8bit through.
-
-Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
-  (interactive)
-  (if (numberp transfer-level)
-      (setq mime/default-transfer-level transfer-level)
-    (if (< mime/default-transfer-level 8)
-       (setq mime/default-transfer-level 8)
-      (setq mime/default-transfer-level 7)
-      ))
-  (setq mime/charset-default-encoding-alist
-       (mime/make-charset-default-encoding-alist
-        mime/default-transfer-level))
-  (message (format "Current transfer-level is %d bit"
-                  mime/default-transfer-level))
-  )
-
 
 ;;; @ coding-system
 ;;;
index e93e7f2..cab1bda 100644 (file)
@@ -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.46 $
+;;; Version: $Revision: 7.47 $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual
 ;;;
 ;;; This file is part of tm (Tools for MIME).
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.46 1996/02/27 16:23:45 morioka Exp $")
+  "$Id: tm-edit.el,v 7.47 1996/03/05 23:19:05 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -361,6 +361,22 @@ To insert a signature file specified by mime-signature-file
   "*Alist of file name, types, parameters, and default encoding.
 If encoding is nil, it is determined from its contents.")
 
+;;; @@ about charset, encoding and transfer-level
+;;;
+
+(defvar mime-editor/transfer-level 7
+  "*A number of network transfer level. It should be bigger than 7.")
+(make-variable-buffer-local 'mime-editor/transfer-level)
+
+(defvar mime-editor/transfer-level-string
+  (mime/encoding-name mime-editor/transfer-level 'not-omit)
+  "*A string formatted version of mime/defaul-transfer-level")
+(make-variable-buffer-local 'mime-editor/transfer-level-string)
+
+(defvar mime-editor/charset-default-encoding-alist
+  (mime/make-charset-default-encoding-alist mime-editor/transfer-level))
+(make-variable-buffer-local 'mime-editor/charset-default-encoding-alist)
+
 ;;; @@ about message inserting
 ;;;
 
@@ -529,7 +545,9 @@ 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"))
+(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."
@@ -582,6 +600,7 @@ Tspecials means any character that matches with it in header must be quoted.")
     (sign      "About sign"            mime-editor/set-sign)
     (encrypt   "About encryption"      mime-editor/set-encrypt)
     (preview   "Preview Message"       mime-editor/preview-message)
+    (level     "Toggle transfer-level" mime-editor/toggle-transfer-level)
     )
   "MIME-edit menubar entry.")
 
@@ -764,6 +783,12 @@ User customizable variables (not documented all of them):
       (use-local-map (copy-keymap (current-local-map))))
     (if (not (lookup-key (current-local-map) mime-prefix))
        (define-key (current-local-map) mime-prefix mime-editor/mime-map))
+
+    ;; Set transfer level into mode line
+    ;;
+    (setq mime-editor/transfer-level-string
+         (mime/encoding-name mime-editor/transfer-level 'not-omit))
+    (force-mode-line-update)
     
     ;; Define menu.  Menus for other emacs implementations are
     ;; welcome.
@@ -1950,7 +1975,8 @@ Content-Transfer-Encoding: 7bit
             (if (null encoding)        ;Encoding is not specified.
                 (let* ((encoding
                         (cdr
-                         (assoc charset mime/charset-default-encoding-alist)
+                         (assoc charset
+                                mime-editor/charset-default-encoding-alist)
                          ))
                        (beg (mime-editor/content-beginning))
                        (end (mime-editor/content-end))
@@ -2267,6 +2293,27 @@ a recording host instead of local host."
     (message "This message is not enabled to split.")
     ))
 
+(defun mime-editor/toggle-transfer-level (&optional transfer-level)
+  "Toggle transfer-level is 7bit or 8bit through.
+
+Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
+  (interactive)
+  (if (numberp transfer-level)
+      (setq mime-editor/transfer-level transfer-level)
+    (if (< mime-editor/transfer-level 8)
+       (setq mime-editor/transfer-level 8)
+      (setq mime-editor/transfer-level 7)
+      ))
+  (setq mime-editor/charset-default-encoding-alist
+       (mime/make-charset-default-encoding-alist
+        mime-editor/transfer-level))
+  (message (format "Current transfer-level is %d bit"
+                  mime-editor/transfer-level))
+  (setq mime-editor/transfer-level-string
+       (mime/encoding-name mime-editor/transfer-level 'not-omit))
+  (force-mode-line-update)
+  )
+
 
 ;;; @ pgp
 ;;;
@@ -2738,19 +2785,6 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
       ))
 
 
-;;; @ etc
-;;;
-
-(defun replace-space-with-underline (str)
-  (mapconcat (function
-             (lambda (arg)
-               (char-to-string
-                (if (= arg 32)
-                    ?_
-                  arg)))) str "")
-  )
-
-
 ;;; @ end
 ;;;