From 20fff7ed3780f95d4789d90a647e195eab400a39 Mon Sep 17 00:00:00 2001 From: morioka Date: Tue, 6 Oct 1998 19:51:23 +0000 Subject: [PATCH] Merge semi-1_8-for-flim-1_10. --- ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 22 ++++++++++++++++++++-- mime-edit.el | 40 ++++++++++++++++++++++------------------ mime-play.el | 36 ++++++++++++++++++------------------ mime-view.el | 9 +++++---- semi-def.el | 4 ++-- 6 files changed, 113 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index aaccb95..0b6de04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +1998-10-06 MORIOKA Tomohiko + + * 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 + + * 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 + + * mime-edit.el (mime-charset-type-list): Use `cn-gb' instead of + `cn-gb2312' because `cn-gb2312' is typo. + +1998-09-29 MORIOKA Tomohiko + + * 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 * mime-edit.el (mime-edit-user-agent-value): Add diff --git a/VERSION b/VERSION index ea29289..da23555 100644 --- a/VERSION +++ b/VERSION @@ -65,7 +65,7 @@ 1.8.4 Takaoka $(B9b2,(B ; = JR $(BI98+@~!">kC<@~(B 1.8.5 Nishi-Takaoka $(B@>9b2,(B 1.8.6 Fukuoka $(BJ!2,(B ------ Isurugi $(B@PF0(B +1.8.7.0 Isurugi $(B@PF0(B ----- Kurikara $(B6fMx2@Me(B ----- Tsubata $(BDEH((B ----- Morimoto $(B?9K\(B @@ -125,8 +125,26 @@ 1.8.2 Katahama $(BJRIM(B 1.8.4 Hara $(B86(B 1.8.5 Higashi-Tagonoura $(BElED;R%N1:(B ------ Yoshiwara $(B5H86(B ; = $(B3YFnE4F;(B +1.8.6 Yoshiwara $(B5H86(B ; = $(B3YFnE4F;(B ----- Fuji $(BIY;N(B ; = JR $(B?H1d@~(B +----- Fujikawa $(BIY;N@n(B +----- Shin-Kambara $(B?73w86(B +----- Kambara $(B3w86(B +----- Yui $(BM3Hf(B +----- Okitsu $(B6=DE(B +----- Shimizu $(B@6?e(B +----- Kusanagi $(BApFe(B +----- Shizuoka $(B@E2,(B +----- Abekawa $(B0BG\@n(B +----- Mochimune $(BMQ=!(B +----- Yaizu $(B>FDE(B +----- Nishi-Yaizu $(B@>>FDE(B +----- Fijieda $(BF#;^(B +----- Rokug-Dò-A $(BO;9g(B +----- Shimada $(BEgED(B +----- Kanaya $(B6bC+(B ; = $(BBg0f@nE4F;(B +----- Kikugawa $(B5F@n(B +----- Kakegawa $(B3]@n(B ; = $(BE7N5IML>8PE4F;(B : : : ----- Kanayama $(B6b;3(B ; =$(B!J(BJR $(BCf1{K\@~!K(B ----- Ot-Dòbashi-A $(BHxF,66(B diff --git a/mime-edit.el b/mime-edit.el index 21607b2..6bb5135 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -119,11 +119,13 @@ ;;; @ 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)) diff --git a/mime-play.el b/mime-play.el index 25610c0..2e921fb 100644 --- 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 " - 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 diff --git a/mime-view.el b/mime-view.el index ffd2579..f52432a 100644 --- a/mime-view.el +++ b/mime-view.el @@ -37,11 +37,12 @@ ;;; @ 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 diff --git a/semi-def.el b/semi-def.el index 96f8d32..4b381d1 100644 --- a/semi-def.el +++ b/semi-def.el @@ -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) -- 1.7.10.4