From: morioka Date: Wed, 14 Oct 1998 05:17:56 +0000 (+0000) Subject: Merge semi-1_9_1. X-Git-Tag: gnus-oomori-199812161505~6 X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fsemi.git;a=commitdiff_plain;h=974eb5256a98baea1fcc96a4289d7566e4e10870 Merge semi-1_9_1. --- diff --git a/ChangeLog b/ChangeLog index aaccb95..1cee95f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,101 @@ +1998-10-14 MORIOKA Tomohiko + + * SEMI: Version 1.9.1 (Kurikara) released. + +1998-10-14 Jari Aalto + + * mime-edit.el (mime-file-types): Add some new mime types, and + rearrange the types to logical sections: text; octext text and + binary. + +1998-10-12 Katsumi Yamaoka + + * README.en: Add explanation about `VERSION_SPECIFIC_LISPDIR'. + + * Makefile (install): Add new arg `VERSION_SPECIFIC_LISPDIR'. + (install-elc): Likewise. + + * SEMI-MK (config-semi): Refer to `VERSION_SPECIFIC_LISPDIR'. + + * SEMI-CFG (VERSION_SPECIFIC_LISPDIR): New variable. + +1998-10-09 MORIOKA Tomohiko + + * SEMI-CFG: Abolish variable `SHELL' and `SHELLOPTION'. + +1998-10-08 Katsumi Yamaoka + + * SEMI-CFG: Use `add-latest-path' for adding "custom" to + load-path. + +1998-10-08 MORIOKA Tomohiko + + * SEMI-CFG: Don't use `when' before install is required; don't + require cl. + +1998-10-08 Katsumi Yamaoka + + * SEMI-CFG: Add "custom" to load-path. + + +1998-10-07 MORIOKA Tomohiko + + * SEMI: Version 1.9.0 (Isurugi) released. + +1998-10-06 MORIOKA Tomohiko + + * README.en (Required environment): Modify for APEL 9.1 and FLIM + 1.10.1. + +1998-10-06 MORIOKA Tomohiko + + * 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 + + * 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/Makefile b/Makefile index d5c4c29..66ecd93 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # PACKAGE = semi -VERSION = 1.8.6 +VERSION = 1.9.1 TAR = tar RM = /bin/rm -f @@ -17,17 +17,20 @@ PREFIX = NONE EXEC_PREFIX = NONE LISPDIR = NONE PACKAGEDIR = NONE +VERSION_SPECIFIC_LISPDIR = NONE GOMI = *.elc elc: $(EMACS) $(FLAGS) -f compile-semi \ - $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) + $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) install-elc: elc $(EMACS) $(FLAGS) -f install-semi \ - $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) + $(PREFIX) $(EXEC_PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) install: install-elc diff --git a/README.en b/README.en index 68ae2fa..a1943c1 100644 --- a/README.en +++ b/README.en @@ -40,7 +40,7 @@ Required environment 19.14. SEMI also does not support Emacs 19.29 to 19.34, XEmacs 19.15 or XEmacs 20.2 without mule, but SEMI 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: @@ -109,6 +109,12 @@ Installation emacs command is used (perhaps /usr/local/share/emacs/site-lisp or /usr/local/lib/xemacs/site-lisp). + If the emu modules (included in APEL package) have been installed in + the non-standard directory, you should specify where they will be + found, for example: + + % make install VERSION_SPECIFIC_LISPDIR=~/elisp + (c) install as a XEmacs package If you want to install to XEmacs package directory, please do diff --git a/SEMI-CFG b/SEMI-CFG index 1136373..c05df10 100644 --- a/SEMI-CFG +++ b/SEMI-CFG @@ -4,8 +4,6 @@ ;;; Code: -(require 'cl) - (defvar default-load-path load-path) (add-to-list 'load-path @@ -13,11 +11,17 @@ (add-to-list 'load-path (expand-file-name "." data-directory)) -(when (boundp 'LISPDIR) - (add-to-list 'default-load-path LISPDIR) - (add-to-list 'load-path LISPDIR) - (add-to-list 'load-path (expand-file-name "apel" LISPDIR)) - ) +(if (boundp 'LISPDIR) + (progn + (add-to-list 'default-load-path LISPDIR) + (add-to-list 'load-path LISPDIR) + (add-to-list 'load-path (expand-file-name "apel" LISPDIR)) + )) + +(defvar VERSION_SPECIFIC_LISPDIR nil) + +(if VERSION_SPECIFIC_LISPDIR + (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR)) (condition-case nil (require 'install) @@ -96,17 +100,11 @@ ;; (add-path "w3-4.0pre.20" 'all-paths) -;;; @ shell +;;; +;;; @@ Please specify CUSTOM path. ;;; -;; Please specify shell command path. -(setq SHELL - (find-if (function file-exists-p) - '("/bin/sh" "/usr/bin/sh") - )) - -;; Please specify shell command option. -(setq SHELLOPTION "-c") +(add-latest-path "custom") ;;; @ Please specify prefix of install directory. diff --git a/SEMI-MK b/SEMI-MK index 11c8137..6a0de68 100644 --- a/SEMI-MK +++ b/SEMI-MK @@ -5,7 +5,7 @@ ;;; Code: (defun config-semi () - (let (prefix exec-prefix lisp-dir) + (let (prefix exec-prefix lisp-dir version-specific-lisp-dir) (and (setq prefix (car command-line-args-left)) (or (string-equal "NONE" prefix) (defvar PREFIX prefix) @@ -21,6 +21,14 @@ (defvar LISPDIR lisp-dir) )) (setq command-line-args-left (cdr command-line-args-left)) + (and (setq version-specific-lisp-dir (car command-line-args-left)) + (or (string-equal "NONE" version-specific-lisp-dir) + (progn + (defvar VERSION_SPECIFIC_LISPDIR version-specific-lisp-dir) + (princ (format "VERSION_SPECIFIC_LISPDIR=%s\n" + VERSION_SPECIFIC_LISPDIR))) + )) + (setq command-line-args-left (cdr command-line-args-left)) ) (load-file "SEMI-CFG") (load-file "SEMI-ELS") diff --git a/VERSION b/VERSION index ea29289..639bad7 100644 --- a/VERSION +++ b/VERSION @@ -65,8 +65,8 @@ 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 ------ Kurikara $(B6fMx2@Me(B +1.9.0 Isurugi $(B@PF0(B +1.9.1 Kurikara $(B6fMx2@Me(B ----- Tsubata $(BDEH((B ----- Morimoto $(B?9K\(B ------- Higashi-Kanazawa $(BEl6bBt(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 ------ Fuji $(BIY;N(B ; = JR $(B?H1d@~(B +1.8.6 Yoshiwara $(B5H86(B ; = $(B3YFnE4F;(B +1.9.0 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..eab91e7 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -119,11 +119,15 @@ ;;; @ 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 @@ -235,25 +239,87 @@ To insert a signature file automatically, call the function "*Alist of content-type, subtype, parameters and its values.") (defcustom mime-file-types - '(("\\.txt$" + '( + + ;; Programming languages + + ("\\.cc$" + "application" "octet-stream" (("type" . "C++")) + "7bit" + "attachment" (("filename" . file)) + ) + + ("\\.el$" + "application" "octet-stream" (("type" . "emacs-lisp")) + "7bit" + "attachment" (("filename" . file)) + ) + + ("\\.lsp$" + "application" "octet-stream" (("type" . "common-lisp")) + "7bit" + "attachment" (("filename" . file)) + ) + + ("\\.pl$" + "application" "octet-stream" (("type" . "perl")) + "7bit" + "attachment" (("filename" . file)) + ) + + ;; Text or translated text + + ("\\.txt$" "text" "plain" nil nil "inline" (("filename" . file)) ) - ("\\.pln$" + + ;; .rc : procmail modules pm-xxxx.rc + ;; *rc : other resource files + + ("\\.\\(rc\\|lst\\|log\\|sql\\|mak\\)$\\|\\..*rc$" "text" "plain" nil nil - "inline" (("filename" . file)) + "attachment" (("filename" . file)) ) + ("\\.html$" "text" "html" nil nil nil nil) + + ("\\.diff$\\|\\.patch$" + "application" "octet-stream" (("type" . "patch")) + nil + "attachment" (("filename" . file)) + ) + + ("\\.signature" + "text" "plain" nil nil nil nil) + + + ;; Octect binary text + + ("\\.doc$" ;MS Word + "application" "winword" nil + "base64" + "attachment" (("filename" . file)) + ) + + ("\\.pln$" + "text" "plain" nil + nil + "inline" (("filename" . file)) + ) ("\\.ps$" "application" "postscript" nil "quoted-printable" "attachment" (("filename" . file)) ) + + ;; Pure binary + ("\\.jpg$" "image" "jpeg" nil "base64" @@ -304,16 +370,6 @@ To insert a signature file automatically, call the function "base64" "attachment" (("filename" . file)) ) - ("\\.el$" - "application" "octet-stream" (("type" . "emacs-lisp")) - "7bit" - "attachment" (("filename" . file)) - ) - ("\\.lsp$" - "application" "octet-stream" (("type" . "common-lisp")) - "7bit" - "attachment" (("filename" . file)) - ) ("\\.tar\\.gz$" "application" "octet-stream" (("type" . "tar+gzip")) "base64" @@ -354,18 +410,9 @@ To insert a signature file automatically, call the function "base64" "attachment" (("filename" . file)) ) - ("\\.diff$" - "application" "octet-stream" (("type" . "patch")) - nil - "attachment" (("filename" . file)) - ) - ("\\.patch$" - "application" "octet-stream" (("type" . "patch")) - nil - "attachment" (("filename" . file)) - ) - ("\\.signature" - "text" "plain" nil nil nil nil) + + ;; Rest + (".*" "application" "octet-stream" nil nil @@ -401,9 +448,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 +481,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 +608,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 +665,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 +1157,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 +1586,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..29c9cb3 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 9 1) "Kurikara"] + "Product name, version number and code name of MIME-kernel package.") (autoload 'mule-caesar-region "mule-caesar" "Caesar rotation of current region." t)