Merge semi-1_8-for-flim-1_10.
authormorioka <morioka>
Tue, 6 Oct 1998 19:51:23 +0000 (19:51 +0000)
committermorioka <morioka>
Tue, 6 Oct 1998 19:51:23 +0000 (19:51 +0000)
ChangeLog
VERSION
mime-edit.el
mime-play.el
mime-view.el
semi-def.el

index aaccb95..0b6de04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+1998-10-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * 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
diff --git a/VERSION b/VERSION
index ea29289..da23555 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
------  Isurugi                 \e$(B@PF0\e(B
+1.8.7.0        Isurugi                 \e$(B@PF0\e(B
 -----  Kurikara                \e$(B6fMx2@Me\e(B
 -----  Tsubata                 \e$(BDEH(\e(B
 -----  Morimoto                \e$(B?9K\\e(B
 1.8.2  Katahama                \e$(BJRIM\e(B
 1.8.4  Hara                    \e$(B86\e(B
 1.8.5  Higashi-Tagonoura       \e$(BElED;R%N1:\e(B
------  Yoshiwara               \e$(B5H86\e(B     ; = \e$(B3YFnE4F;\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
+-----  Fujikawa                \e$(BIY;N@n\e(B
+-----  Shin-Kambara            \e$(B?73w86\e(B
+-----  Kambara                 \e$(B3w86\e(B
+-----  Yui                     \e$(BM3Hf\e(B
+-----  Okitsu                  \e$(B6=DE\e(B
+-----  Shimizu                 \e$(B@6?e\e(B
+-----  Kusanagi                \e$(BApFe\e(B
+-----  Shizuoka                \e$(B@E2,\e(B
+-----  Abekawa                 \e$(B0BG\@n\e(B
+-----  Mochimune               \e$(BMQ=!\e(B
+-----  Yaizu                   \e$(B>FDE\e(B
+-----  Nishi-Yaizu             \e$(B@>>FDE\e(B
+-----  Fijieda                 \e$(BF#;^\e(B
+-----  Rokug\e-Dò\e-A                    \e$(BO;9g\e(B
+-----  Shimada                 \e$(BEgED\e(B
+-----  Kanaya                  \e$(B6bC+\e(B     ; = \e$(BBg0f@nE4F;\e(B
+-----  Kikugawa                \e$(B5F@n\e(B
+-----  Kakegawa                \e$(B3]@n\e(B     ; = \e$(BE7N5IML>8PE4F;\e(B
 :      :                       :
 -----  Kanayama                \e$(B6b;3\e(B     ; =\e$(B!J\e(BJR \e$(BCf1{K\@~!K\e(B
 -----  Ot\e-Dòbashi\e-A          \e$(BHxF,66\e(B
index 21607b2..6bb5135 100644 (file)
 ;;; @ 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) "\""))
+(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
@@ -401,9 +403,9 @@ If encoding is nil, it is determined from its contents."
                        ,@(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)
@@ -434,7 +436,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")
-    (cn-gb2312         8 "base64")
+    (cn-gb             8 "base64")
     (gb2312            8 "base64")
     (cn-big5           8 "base64")
     (big5              8 "base64")
@@ -561,19 +563,19 @@ If it is not specified for a major-mode,
   "*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
-                    (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
-                    (cddr mime-library-version) ".")
+                    (mime-product-version mime-library-product) ".")
          " ("
-         (cadr mime-library-version)
+         (mime-product-code-name mime-library-product)
          ") "
          (if (featurep 'xemacs)
              (concat (if (featurep 'mule) "MULE")
@@ -618,11 +620,13 @@ inserted into message header.")
 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
-  (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.")
 
 
@@ -1108,7 +1112,7 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
   (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
@@ -1537,7 +1541,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
            (setq encoding
                  (completing-read
                   "What transfer encoding: "
-                  mime-file-encoding-method-alist nil t default)
+                  (mime-encoding-alist) nil t default)
                  )
            ""))
     encoding))
index 25610c0..2e921fb 100644 (file)
@@ -51,7 +51,7 @@
           (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)
@@ -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)))
 
-(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
@@ -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))
-       (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
index ffd2579..f52432a 100644 (file)
 ;;; @ 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
-                      (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
index 96f8d32..4b381d1 100644 (file)
@@ -30,8 +30,8 @@
 
 (require 'custom)
 
-(defconst mime-user-interface-version '("SEMI" "Fukuoka" 1 8 6)
-  "Implementation name, version name and numbers of MIME-kernel package.")
+(defconst mime-user-interface-product ["SEMI" (1 8 7 0) "Isurugi"]
+  "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"
   "Caesar rotation of current region." t)