This commit was generated by cvs2svn to compensate for changes in r479,

which included commits to RCS files with non-trunk default branches.

diff --git a/ChangeLog b/ChangeLog
index 2f9428b..4e813db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Thu Oct 31 15:17:33 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * MEL: Version 6.0.1 was released.
+       * tm: Version 7.93 was released.
+       * tm-vm: Version 7.73 was released.
+
+       * tm-edit.el (mime-editor/message-default-max-lines): Renamed from
+       `mime-editor/message-default-max-size'.
+
+       (mime-editor/message-max-lines-alist): Renamed from
+       `mime-editor/message-max-size-alist'.
+
+Mon Oct 28 08:44:12 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * tm-parse.el: Require tl-822.el.
+
+       * tm-def.el: Don't require tl-822.
+
+       * tm-parse.el (mime/content-parameter-value-regexp): New constant;
+       from tm-def.el.
+
+       * tm-def.el: Definition of constant
+       `mime/content-parameter-value-regexp' was moved to tm-parse.el.
+
+\f
 Thu Oct 24 08:25:47 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * tl: Version 7.61.12 was released.
@@ -60,7 +85,7 @@ Fri Oct 18 04:47:02 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 Thu Oct 17 02:00:30 1996  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
 
        * tm-bbdb.el (tm-bbdb/pop-up-bbdb-buffer): Hunter Kelly
-       <retnuh@zule.pixar.com>'s patch was applied.
+       <retnuh@zule.pixar.com>'s patch was applied. (cf. [tm-en:847])
 
 \f
 Wed Oct 16 00:35:29 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>

diff --git a/Makefile b/Makefile
index cd3cc4a..657f221 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # $Id: Makefile,v 7.30 1996/10/16 00:35:29 morioka Exp morioka $
 #
 
-VERSION = 7.92
+VERSION = 7.93
 
 SHELL  = /bin/sh
 MAKE   = make
@@ -112,8 +112,14 @@ clean:
 oomori:
        cd doc; $(MAKE) tex
        cd ..; gtar cvf tm$(VERSION).tar $(FILES)
-       -cd ..; mkdir tm$(VERSION)
-       cp ../tm-oomori/README.?? ../tm$(VERSION)
-       cd ../tm$(VERSION); gtar xvf ../tm$(VERSION).tar
-       cd ..; gtar cvzf tm$(VERSION).tar.gz tm$(VERSION)
-       cd ..; $(RM) -r tm$(VERSION); rm tm$(VERSION).tar
+       -cd ..; mkdir tm-$(VERSION)
+       cp ../tm-oomori/README.?? ../tm-$(VERSION)
+       cd ../tm-$(VERSION); gtar xvf ../tm$(VERSION).tar
+       cd ..; gtar cvzf tm$(VERSION).tar.gz tm-$(VERSION)
+       cd ..; $(RM) -r tm-$(VERSION); rm tm$(VERSION).tar
+
+
+release:
+       cd ..; mv tm$(VERSION).tar.gz /pub/GNU/elisp/mime/beta/
+       -cd /pub/GNU/elisp/mime/beta/ ; rm tm-oomori-current.tar.gz
+       cd /pub/GNU/elisp/mime/beta/ ; ln -s tm$(VERSION).tar.gz tm-oomori-current.tar.gz

diff --git a/tm-def.el b/tm-def.el
index 6d920e3..67d9b6e 100644 (file)
--- a/tm-def.el
+++ b/tm-def.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: tm-def.el,v 7.63 1996/09/05 09:08:31 morioka Exp $
+;; Version: $Id: tm-def.el,v 7.65 1996/10/28 08:43:40 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia, definition
 
 ;; This file is part of tm (Tools for MIME).
@@ -19,14 +19,13 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
 (require 'emu)
-(require 'tl-822)
 
 
 ;;; @ variables
@@ -173,10 +172,6 @@
 
 (defconst mime/content-type-subtype-regexp
   (concat mime/token-regexp "/" mime/token-regexp))
-(defconst mime/content-parameter-value-regexp
-  (concat "\\("
-         rfc822/quoted-string-regexp
-         "\\|[^; \t\n]*\\)"))
 
 (defconst mime/disposition-type-regexp mime/token-regexp)
 

diff --git a/tm-edit.el b/tm-edit.el
index 6e9724c..6846e07 100644 (file)
--- a/tm-edit.el
+++ b/tm-edit.el
@@ -6,7 +6,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.92 $
+;; Version: $Revision: 7.93 $
 ;; Keywords: mail, news, MIME, multimedia, multilingual
 
 ;; This file is part of tm (Tools for MIME).
@@ -121,7 +121,7 @@
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.92 1996/10/24 08:25:47 morioka Exp $")
+  "$Id: tm-edit.el,v 7.93 1996/10/31 15:17:33 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
@@ -405,11 +405,14 @@ Each elements are regexp of field-name. [tm-edit.el]")
 (defvar mime-editor/split-message t
   "*Split large message if it is non-nil. [tm-edit.el]")
 
-(defvar mime-editor/message-default-max-length 1000
-  "*Default maximum size of a message. [tm-edit.el]")
+(defvar mime-editor/message-default-max-lines 1000
+  "*Default maximum lines of a message. [tm-edit.el]")
 
-(defvar mime-editor/message-max-length-alist
-  '((news-reply-mode . 500)))
+(defvar mime-editor/message-max-lines-alist
+  '((news-reply-mode . 500))
+  "Alist of major-mode vs maximum lines of a message.
+If it is not specified for a major-mode,
+`mime-editor/message-default-max-lines' is used. [tm-edit.el]")
 
 (defconst mime-editor/split-ignored-field-regexp
   "\\(^Content-\\|^Subject:\\|^Mime-Version:\\)")
@@ -2316,8 +2319,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
       )
   (or mime-editor/message-max-length
       (setq mime-editor/message-max-length
-           (or (cdr (assq major-mode mime-editor/message-max-length-alist))
-               mime-editor/message-default-max-length))
+           (or (cdr (assq major-mode mime-editor/message-max-lines-alist))
+               mime-editor/message-default-max-lines))
       )
   (let* ((mime-editor/draft-file-name 
          (or (buffer-file-name)
@@ -2411,8 +2414,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
   (interactive)
   (run-hooks 'mime-editor/before-send-hook)
   (let ((mime-editor/message-max-length
-        (or (cdr (assq major-mode mime-editor/message-max-length-alist))
-            mime-editor/message-default-max-length))
+        (or (cdr (assq major-mode mime-editor/message-max-lines-alist))
+            mime-editor/message-default-max-lines))
        (lines (count-lines (point-min) (point-max)))
        )
     (if (and (> lines mime-editor/message-max-length)

diff --git a/tm-parse.el b/tm-parse.el
index e5a390f..6b42232 100644 (file)
--- a/tm-parse.el
+++ b/tm-parse.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: tm-parse.el,v 7.13 1996/09/20 07:27:41 morioka Exp $
+;; Version: $Id: tm-parse.el,v 7.15 1996/10/28 08:44:12 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia
 
 ;; This file is part of tm (Tools for MIME).
@@ -19,13 +19,13 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
-(require 'std11)
+(require 'tl-822)
 (require 'tl-misc)
 (require 'tm-def)
 
@@ -33,6 +33,11 @@
 ;;; @ field parser
 ;;;
 
+(defconst mime/content-parameter-value-regexp
+  (concat "\\("
+         rfc822/quoted-string-regexp
+         "\\|[^; \t\n]*\\)"))
+
 (defconst mime::parameter-regexp
   (concat "^[ \t]*\;[ \t]*\\(" mime/token-regexp "\\)"
          "[ \t]*=[ \t]*\\(" mime/content-parameter-value-regexp "\\)"))