Sync up with SEMI 1.9.0.

diff --git a/ChangeLog b/ChangeLog
index 9680ab0..4dd53d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+1998-10-07  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * WEMI: Version 1.9.0 (Fuji) released.
+
+1998-10-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * README.en (Required environment): Modify for APEL 9.1 and FLIM
+       1.10.1.
+
+1998-10-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-version): Enclose with
+       `eval-and-compile'.
+
+       * mime-edit.el (mime-edit-version): Renamed from
+       `mime-edit-version-string'; use `mime-user-interface-product',
+       `mime-product-name', `mime-product-version' and
+       `mime-product-code-name'.
+       (mime-edit-user-agent-value): Use `mime-user-interface-product',
+       `mime-library-product', `mime-product-name',
+       `mime-product-version' and `mime-product-code-name'.
+       (mime-edit-mime-version-value): Rename `mime-edit-version-string'
+       -> `mime-edit-version'.
+       (mime-edit-mime-version-field-for-message/partial): Likewise.
+
+       * mime-play.el (mime-save-acting-situation-examples): Rename
+       `mime-view-version-string' -> `mime-view-version'.
+
+       * mime-view.el (mime-view-version): Renamed from
+       `mime-view-version-string'; use `mime-user-interface-product',
+       `mime-product-name', `mime-product-version' and
+       `mime-product-code-name'.
+
+       * semi-def.el (mime-user-interface-product): New variable; abolish
+       `mime-user-interface-version'.
+
+1998-10-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-play.el (mime-echo-window-is-shared-with-bbdb): Check bbdb
+       is install or not to define default value.
+       (mime-show-echo-buffer): New implementation about
+       `mime-echo-window-is-shared-with-bbdb'.
+
+1998-10-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-charset-type-list): Use `cn-gb' instead of
+       `cn-gb2312' because `cn-gb2312' is typo.
+
+1998-09-29  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-file-types): Use function
+       `mime-encoding-list' instead of variable
+       `mime-file-encoding-method-alist' to define default value.
+       (mime-edit-insert-voice): Use function `mime-encoding-alist'
+       instead of variable `mime-file-encoding-method-alist' for
+       completion.
+       (mime-prompt-for-encoding): Likewise.
+
+1998-09-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-user-agent-value): Add
+       system-configuration for Emacs and XEmacs.
+
+1998-09-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-normalize-body): Use "7bit" for nil
+       encoding as an argument of `mime-encode-region'.
+
+\f

 1998-09-16  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * WEMI: Version 1.8.6 (Yoshiwara) released.
 1998-09-16  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * WEMI: Version 1.8.6 (Yoshiwara) released.

diff --git a/Makefile b/Makefile
index 2e6b3d6..4eee65f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 PACKAGE = wemi
 #
 
 PACKAGE = wemi

-VERSION = 1.8.6
+VERSION = 1.9.0

 
 TAR    = tar
 RM     = /bin/rm -f
 
 TAR    = tar
 RM     = /bin/rm -f

diff --git a/README.en b/README.en
index a9ff771..b292279 100644 (file)
--- a/README.en
+++ b/README.en
@@ -44,7 +44,7 @@ Required environment
   19.14.  WEMI also does not support Emacs 19.29 to 19.34, XEmacs
   19.15 or XEmacs 20.2 without mule, but WEMI may work with them.
 
   19.14.  WEMI also does not support Emacs 19.29 to 19.34, XEmacs
   19.15 or XEmacs 20.2 without mule, but WEMI may work with them.
 

-  SEMI requires APEL (8.17 or later) and FLIM (1.9.2 or later)
+  SEMI requires APEL (9.1 or later) and FLIM (1.10.1 or later)

   package.  Please install them before installing it.  APEL package is
   available at:
 
   package.  Please install them before installing it.  APEL package is
   available at:
 

diff --git a/VERSION b/VERSION
index 82dc986..16b6b81 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -65,7 +65,7 @@
 1.8.4  Takaoka                 \e$(B9b2,\e(B             ; = JR \e$(BI98+@~!">kC<@~\e(B
 1.8.5  Nishi-Takaoka           \e$(B@>9b2,\e(B
 1.8.6  Fukuoka                 \e$(BJ!2,\e(B
 1.8.4  Takaoka                 \e$(B9b2,\e(B             ; = JR \e$(BI98+@~!">kC<@~\e(B
 1.8.5  Nishi-Takaoka           \e$(B@>9b2,\e(B
 1.8.6  Fukuoka                 \e$(BJ!2,\e(B

------  Isurugi                 \e$(B@PF0\e(B
+1.9.0  Isurugi                 \e$(B@PF0\e(B

 -----  Kurikara                \e$(B6fMx2@Me\e(B
 -----  Tsubata                 \e$(BDEH(\e(B
 -----  Morimoto                \e$(B?9K\\e(B
 -----  Kurikara                \e$(B6fMx2@Me\e(B
 -----  Tsubata                 \e$(BDEH(\e(B
 -----  Morimoto                \e$(B?9K\\e(B

@@ -126,7 +126,7 @@
 1.8.4  Hara                    \e$(B86\e(B
 1.8.5  Higashi-Tagonoura       \e$(BElED;R%N1:\e(B
 1.8.6  Yoshiwara               \e$(B5H86\e(B     ; = \e$(B3YFnE4F;\e(B
 1.8.4  Hara                    \e$(B86\e(B
 1.8.5  Higashi-Tagonoura       \e$(BElED;R%N1:\e(B
 1.8.6  Yoshiwara               \e$(B5H86\e(B     ; = \e$(B3YFnE4F;\e(B

------  Fuji                    \e$(BIY;N\e(B     ; = JR \e$(B?H1d@~\e(B
+1.9.0  Fuji                    \e$(BIY;N\e(B     ; = JR \e$(B?H1d@~\e(B

 -----  Fujikawa                \e$(BIY;N@n\e(B
 -----  Shin-Kambara            \e$(B?73w86\e(B
 -----  Kambara                 \e$(B3w86\e(B
 -----  Fujikawa                \e$(BIY;N@n\e(B
 -----  Shin-Kambara            \e$(B?73w86\e(B
 -----  Kambara                 \e$(B3w86\e(B

diff --git a/mime-edit.el b/mime-edit.el
index 1aa3c2f..7a7d682 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -119,11 +119,15 @@
 ;;; @ version
 ;;;
 
 ;;; @ version
 ;;;
 

-(defconst mime-edit-version-string
-  `,(concat (car mime-user-interface-version) " "
-           (mapconcat #'number-to-string
-                      (cddr mime-user-interface-version) ".")
-           " - \"" (cadr mime-user-interface-version) "\""))
+(eval-and-compile
+  (defconst mime-edit-version
+    (eval-when-compile
+      (concat
+       (mime-product-name mime-user-interface-product) " "
+       (mapconcat #'number-to-string
+                 (mime-product-version mime-user-interface-product) ".")
+       " - \"" (mime-product-code-name mime-user-interface-product) "\"")))
+  )

 
 
 ;;; @ variables
 
 
 ;;; @ variables

@@ -401,9 +405,9 @@ If encoding is nil, it is determined from its contents."
                        ,@(cons
                           '(const nil)
                           (mapcar (lambda (cell)
                        ,@(cons
                           '(const nil)
                           (mapcar (lambda (cell)

-                                    (list 'item (car cell))
+                                    (list 'item cell)

                                     )
                                     )

-                                  mime-file-encoding-method-alist)))
+                                  (mime-encoding-list))))

                ;; disposition-type
                (choice :tag "Disposition-Type"
                        (item nil)
                ;; disposition-type
                (choice :tag "Disposition-Type"
                        (item nil)

@@ -434,7 +438,7 @@ If encoding is nil, it is determined from its contents."
     (iso-2022-jp       7 "base64")
     (iso-2022-kr       7 "base64")
     (euc-kr            8 "base64")
     (iso-2022-jp       7 "base64")
     (iso-2022-kr       7 "base64")
     (euc-kr            8 "base64")

-    (cn-gb2312         8 "base64")
+    (cn-gb             8 "base64")

     (gb2312            8 "base64")
     (cn-big5           8 "base64")
     (big5              8 "base64")
     (gb2312            8 "base64")
     (cn-big5           8 "base64")
     (big5              8 "base64")

@@ -561,35 +565,37 @@ If it is not specified for a major-mode,
   "*If non-nil, insert User-Agent header field.")
 
 (defvar mime-edit-user-agent-value
   "*If non-nil, insert User-Agent header field.")
 
 (defvar mime-edit-user-agent-value

-  (concat (car mime-user-interface-version)
+  (concat (mime-product-name mime-user-interface-product)

          "/"
          (mapconcat #'number-to-string
          "/"
          (mapconcat #'number-to-string

-                    (cddr mime-user-interface-version) ".")
+                    (mime-product-version mime-user-interface-product) ".")

          " ("
          " ("

-         (cadr mime-user-interface-version)
+         (mime-product-code-name mime-user-interface-product)

          ") "
          ") "

-         (car mime-library-version)
+         (mime-product-name mime-library-product)

          "/"
          (mapconcat #'number-to-string
          "/"
          (mapconcat #'number-to-string

-                    (cddr mime-library-version) ".")
+                    (mime-product-version mime-library-product) ".")

          " ("
          " ("

-         (cadr mime-library-version)
+         (mime-product-code-name mime-library-product)

          ") "
          (if (featurep 'xemacs)
          ") "
          (if (featurep 'xemacs)

-             (concat "XEmacs"
+             (concat (if (featurep 'mule) "MULE")
+                     " XEmacs"

                      (if (string-match "\\s +\\\"" emacs-version)
                          (concat "/"
                                  (substring emacs-version 0
                                             (match-beginning 0))
                      (if (string-match "\\s +\\\"" emacs-version)
                          (concat "/"
                                  (substring emacs-version 0
                                             (match-beginning 0))

-                                 " (" xemacs-codename ")")
-                       " (" emacs-version ")")
-                     (if (featurep 'mule) " MULE"))
+                                 " (" xemacs-codename ") ("
+                                 system-configuration ")")
+                       " (" emacs-version ")"))

            (let ((ver (if (string-match "\\.[0-9]+$" emacs-version)
                           (substring emacs-version 0 (match-beginning 0))
                         emacs-version)))
              (if (featurep 'mule)
                  (if (boundp 'enable-multibyte-characters)
                      (concat "Emacs/" ver
            (let ((ver (if (string-match "\\.[0-9]+$" emacs-version)
                           (substring emacs-version 0 (match-beginning 0))
                         emacs-version)))
              (if (featurep 'mule)
                  (if (boundp 'enable-multibyte-characters)
                      (concat "Emacs/" ver

+                             " (" system-configuration ")"

                              (if enable-multibyte-characters
                                  (concat " MULE/" mule-version)
                                " (with unibyte mode)")
                              (if enable-multibyte-characters
                                  (concat " MULE/" mule-version)
                                " (with unibyte mode)")

@@ -602,7 +608,7 @@ If it is not specified for a major-mode,
                                      ))))
                    (concat "MULE/" mule-version
                            " (based on Emacs " ver ")"))
                                      ))))
                    (concat "MULE/" mule-version
                            " (based on Emacs " ver ")"))

-               ver))))
+               (concat "Emacs/" ver " (" system-configuration ")")))))

   "Body of User-Agent field.
 If variable `mime-edit-insert-user-agent-field' is not nil, it is
 inserted into message header.")
   "Body of User-Agent field.
 If variable `mime-edit-insert-user-agent-field' is not nil, it is
 inserted into message header.")

@@ -616,11 +622,13 @@ inserted into message header.")
 Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-edit-mime-version-value
 Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-edit-mime-version-value

-  (concat "1.0 (generated by " mime-edit-version-string ")")
+  (eval-when-compile
+    (concat "1.0 (generated by " mime-edit-version ")"))

   "MIME version number.")
 
 (defconst mime-edit-mime-version-field-for-message/partial
   "MIME version number.")
 
 (defconst mime-edit-mime-version-field-for-message/partial

-  (concat "MIME-Version: 1.0 (split by " mime-edit-version-string ")\n")
+  (eval-when-compile
+    (concat "MIME-Version: 1.0 (split by " mime-edit-version ")\n"))

   "MIME version field for message/partial.")
 
 
   "MIME version field for message/partial.")
 
 

@@ -1106,7 +1114,7 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
   (let ((encoding
         (completing-read
          "What transfer encoding: "
   (let ((encoding
         (completing-read
          "What transfer encoding: "

-         mime-file-encoding-method-alist nil t nil)))
+         (mime-encoding-alist) nil t nil)))

     (mime-edit-insert-tag "audio" "basic" nil)
     (mime-edit-define-encoding encoding)
     (save-restriction
     (mime-edit-insert-tag "audio" "basic" nil)
     (mime-edit-define-encoding encoding)
     (save-restriction

@@ -1535,7 +1543,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
            (setq encoding
                  (completing-read
                   "What transfer encoding: "
            (setq encoding
                  (completing-read
                   "What transfer encoding: "

-                  mime-file-encoding-method-alist nil t default)
+                  (mime-encoding-alist) nil t default)

                  )
            ""))
     encoding))
                  )
            ""))
     encoding))

@@ -2069,7 +2077,8 @@ Content-Transfer-Encoding: 7bit
                    (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t)
                      (replace-match "\\1\r\n"))))
              (goto-char beg)
                    (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t)
                      (replace-match "\\1\r\n"))))
              (goto-char beg)

-             (mime-encode-region beg (mime-edit-content-end) encoding)
+             (mime-encode-region beg (mime-edit-content-end)
+                                 (or encoding "7bit"))

              (mime-edit-define-encoding encoding)
              ))
        (goto-char (mime-edit-content-end))
              (mime-edit-define-encoding encoding)
              ))
        (goto-char (mime-edit-content-end))

diff --git a/mime-play.el b/mime-play.el
index 25610c0..2e921fb 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -51,7 +51,7 @@
           (erase-buffer)
           (insert ";;; " (file-name-nondirectory file) "\n")
           (insert "\n;; This file is generated automatically by "
           (erase-buffer)
           (insert ";;; " (file-name-nondirectory file) "\n")
           (insert "\n;; This file is generated automatically by "

-                  mime-view-version-string "\n\n")
+                  mime-view-version "\n\n")

          (insert ";;; Code:\n\n")
          (pp `(setq mime-acting-situation-example-list
                     ',mime-acting-situation-example-list)
          (insert ";;; Code:\n\n")
          (pp `(setq mime-acting-situation-example-list
                     ',mime-acting-situation-example-list)

@@ -352,7 +352,8 @@ specified, play as it.  Default MODE is \"play\"."
   (remove-alist 'mime-mailcap-method-filename-alist process)
   (message (format "%s %s" process event)))
 
   (remove-alist 'mime-mailcap-method-filename-alist process)
   (message (format "%s %s" process event)))
 

-(defvar mime-echo-window-is-shared-with-bbdb t
+(defvar mime-echo-window-is-shared-with-bbdb
+  (module-installed-p 'bbdb)

   "*If non-nil, mime-echo window is shared with BBDB window.")
 
 (defvar mime-echo-window-height
   "*If non-nil, mime-echo window is shared with BBDB window.")
 
 (defvar mime-echo-window-height

@@ -370,23 +371,22 @@ window.")
   "Show mime-echo buffer to display MIME-playing information."
   (get-buffer-create mime-echo-buffer-name)
   (let ((the-win (selected-window))
   "Show mime-echo buffer to display MIME-playing information."
   (get-buffer-create mime-echo-buffer-name)
   (let ((the-win (selected-window))

-       (win (get-buffer-window mime-echo-buffer-name))
+       (win (get-buffer-window mime-echo-buffer-name)))
+    (unless win
+      (unless (and mime-echo-window-is-shared-with-bbdb
+                  (condition-case nil
+                      (setq win (get-buffer-window bbdb-buffer-name))
+                    (error nil)))
+       (select-window (get-buffer-window mime-preview-buffer))
+       (setq win (split-window-vertically
+                  (- (window-height)
+                     (if (functionp mime-echo-window-height)
+                         (funcall mime-echo-window-height)
+                       mime-echo-window-height)
+                     )))

        )
        )

-    (or win
-       (if (and mime-echo-window-is-shared-with-bbdb
-                (boundp 'bbdb-buffer-name)
-                (setq win (get-buffer-window bbdb-buffer-name))
-                )
-           (set-window-buffer win mime-echo-buffer-name)
-         (select-window (get-buffer-window mime-preview-buffer))
-         (setq win (split-window-vertically
-                    (- (window-height)
-                       (if (functionp mime-echo-window-height)
-                           (funcall mime-echo-window-height)
-                         mime-echo-window-height)
-                       )))
-         (set-window-buffer win mime-echo-buffer-name)
-         ))
+      (set-window-buffer win mime-echo-buffer-name)
+      )

     (select-window win)
     (goto-char (point-max))
     (if forms
     (select-window win)
     (goto-char (point-max))
     (if forms

diff --git a/mime-view.el b/mime-view.el
index 3d09f91..d4b1e54 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -37,11 +37,12 @@
 ;;; @ version
 ;;;
 
 ;;; @ version
 ;;;
 

-(defconst mime-view-version-string
-  `,(concat (car mime-user-interface-version) " MIME-View "
+(defconst mime-view-version
+  (eval-when-compile
+    (concat (mime-product-name mime-user-interface-product) " MIME-View "

            (mapconcat #'number-to-string
            (mapconcat #'number-to-string

-                      (cddr mime-user-interface-version) ".")
-           " (" (cadr mime-user-interface-version) ")"))
+                      (mime-product-version mime-user-interface-product) ".")
+           " (" (mime-product-code-name mime-user-interface-product) ")")))

 
 
 ;;; @ variables
 
 
 ;;; @ variables

diff --git a/semi-def.el b/semi-def.el
index 4027c0d..057cbb6 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -29,7 +29,7 @@
 (eval-when-compile (require 'cl))
 
 
 (eval-when-compile (require 'cl))
 
 

-(defconst mime-user-interface-version '("WEMI" "Yoshiwara" 1 8 6)
+(defconst mime-user-interface-product '["WEMI" (1 9 0) "Fuji"]

   "Implementation name, version name and numbers of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"
   "Implementation name, version name and numbers of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"