WEMI 1.8.6 (Yoshiwara): Sync up with SEMI 1.8.6 (Fukuoka). wemi-1_8_6
authoryamaoka <yamaoka>
Wed, 16 Sep 1998 10:49:14 +0000 (10:49 +0000)
committeryamaoka <yamaoka>
Wed, 16 Sep 1998 10:49:14 +0000 (10:49 +0000)
ChangeLog
Makefile
README.en
SEMI-CFG
SEMI-MK
VERSION
mime-edit.el
semi-def.el

index 7efe51a..9680ab0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+1998-09-16  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * WEMI: Version 1.8.6 (Yoshiwara) released.
+
+1998-09-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * README.en (Installation): Add description for `run in expanded
+       place' and `install as a XEmacs package'.
+
+       * README.en (Required environment): Require FLIM 1.9.2 or later.
+
+1998-09-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-file-types): Abolish setting for
+       text/richtext.
+       (mime-edit-insert-text): Likewise.
+
+       * mime-edit.el (mime-content-types): Modify comment style.
+
+1998-09-13  Shin'ichiro Tanaka <tanaka@ifos.se.fujitsu.co.jp>
+
+       * mime-edit.el (mime-content-types): Delete text/richtext and add
+       text/css and text/xml (cf. [tm-ja:3387]).
+
+1998-09-11  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-insert-user-agent-field): New variable
+       (abolish `mime-edit-insert-x-emacs-field').
+       (mime-edit-user-agent-value): New variable (abolish
+       `mime-edit-x-emacs-value').
+       (mime-edit-translate-body): Insert User-Agent field instead of
+       `X-Emacs' field.
+       (mime-edit-again-ignored-field-regexp): Add `User-Agent' instead
+       of `X-Emacs' field conditionally.
+
+1998-09-11  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI-MK (config-semi-package): New function.
+       (compile-semi-package): New function.
+       (install-semi-package): New function.
+
+       * SEMI-CFG (PACKAGEDIR): New variable.
+
+       * Makefile: Abolish variable `SHELL', `MAKE', `CC' and `CFLAGS'.
+       (XEMACS): New variable.
+       (FLAGS): Add `-l SEMI-MK'.
+       (PACKAGEDIR): New variable.
+       (elc): Delete `-l SEMI-MK'.
+       (install-elc): Delete `-l SEMI-MK'.  Abolish target `all', `tex',
+       `dvi' and `ps'.
+       (package): New target.
+       (install-package): New target.
+       (clean): Delete historical setting.
+
+\f
 1998-09-01  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * WEMI: Version 1.8.5 (Higashi-Tagonoura) released.
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.3 (Ecch\e-Dþ-Nakagawa) released.\e-A
+       * REMI: Version 1.8.3 (Ecch\e-Dþ-Nakagawa)\e-A released.
 
        * mime-play.el (mime-delq-null-situation): Add new optional
        argument `ignored-value'.
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.2 (N\e-Dòmachi) released.\e-A
+       * REMI: Version 1.8.2 (N\e-Dòmachi)\e-A released.
 
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 \f
 1998-06-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.0 (Ecch\e-Dþ-Kokubu) released.\e-A
+       * REMI: Version 1.8.0 (Ecch\e-Dþ-Kokubu)\e-A released.
 
 1998-06-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 \f
 1998-03-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae) was released.\e-A
+       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae)\e-A was released.
 
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 \f
 1998-02-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae) was released.\e-A
+       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae)\e-A was released.
 
        * SEMI-ELS: Remove mime-tar.el.
 
 \f
 1997-11-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 0.116 (D\e-Dòhòji) was released.\e-A
+       * SEMI: Version 0.116 (D\e-Dòhòji)\e-A was released.
 
 1997-11-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
index 4ded509..2e6b3d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,59 +1,46 @@
 #
-# Makefile for WEMI.
+# Makefile for WEMI kernel.
 #
 
 PACKAGE = wemi
-VERSION = 1.8.5
+VERSION = 1.8.6
 
-SHELL  = /bin/sh
-MAKE   = make
-CC     = gcc
-CFLAGS = -O2
 TAR    = tar
 RM     = /bin/rm -f
 CP     = /bin/cp -p
-EMACS  = emacs
 
-GOMI   = *.elc
-FLAGS   = -batch -q -no-site-file
+EMACS  = emacs
+XEMACS = xemacs
+FLAGS   = -batch -q -no-site-file -l SEMI-MK
 
 PREFIX = NONE
 EXEC_PREFIX = NONE
 LISPDIR = NONE
+PACKAGEDIR = NONE
+
+GOMI   = *.elc
+
 
 elc:
-       $(EMACS) $(FLAGS) -l SEMI-MK -f compile-semi \
+       $(EMACS) $(FLAGS) -f compile-semi \
                $(PREFIX) $(EXEC_PREFIX) $(LISPDIR)
 
 install-elc:   elc
-       $(EMACS) $(FLAGS) -l SEMI-MK -f install-semi \
+       $(EMACS) $(FLAGS) -f install-semi \
                $(PREFIX) $(EXEC_PREFIX) $(LISPDIR)
 
-
-all:   $(UTILS) $(DVI) elc
-
-tex:   ol2
-       cd doc; $(MAKE) tex
-
-dvi:   ol2
-       cd doc; $(MAKE) dvi
-
-ps:    ol2
-       cd doc; $(MAKE) ps
+install:       install-elc
 
 
-install:       install-elc
+package:
+       $(XEMACS) $(FLAGS) -f compile-semi-package $(PACKAGEDIR)
 
-update-xemacs:
-       $(EMACS) $(FLAGS) -l SEMI-MK -f update-xemacs-source
+install-package:       package
+       $(XEMACS) $(FLAGS) -f install-semi-package $(PACKAGEDIR)
 
 
 clean:
        -$(RM) $(GOMI)
-       -cd doc   && $(MAKE) clean
-       -cd gnus  && $(MAKE) clean
-       -cd mh-e  && $(MAKE) clean
-       cd ../mel && $(MAKE) clean
 
 
 tar:
index 4c12700..a9ff771 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.
 
-  SEMI requires APEL (8.17 or later) and FLIM (1.9.1 or later)
+  SEMI requires APEL (8.17 or later) and FLIM (1.9.2 or later)
   package.  Please install them before installing it.  APEL package is
   available at:
 
@@ -64,6 +64,23 @@ Required environment
 Installation
 ============
 
+(a) run in expanded place
+
+  If you don't want to install other directories, please do only
+  following:
+
+       % make
+
+  You can specify the emacs command name, for example
+
+       % make EMACS=xemacs
+
+  If `EMACS=...' is omitted, EMACS=emacs is used.
+
+(b) make install
+
+  If you want to install other directories, please do following:
+
        % make install
 
   You can specify the emacs command name, for example
@@ -96,6 +113,30 @@ Installation
   emacs command is used (perhaps /usr/local/share/emacs/site-lisp or
   /usr/local/lib/xemacs/site-lisp).
 
+(c) install as a XEmacs package
+
+  If you want to install to XEmacs package directory, please do
+  following:
+
+       % make install-package
+
+  You can specify the emacs command name, for example
+
+       % make install-package XEMACS=xemacs-21
+
+  If `XEMACS=...' is omitted, XEMACS=xemacs is used.
+
+  You can specify the package directory, for example:
+
+       % make install PACKAGEDIR=~/.xemacs
+
+  If `PACKAGEDIR=...' is omitted, the first existing package
+  directory is used.
+
+  Notice that XEmacs package system requires XEmacs 21.0 or later.
+
+(a,b,c)
+
   You can specify other optional settings by editing the file
   ${archive}/SEMI-CFG.  Please read ${archive}/README.en and comments
   in ${archive}/SEMI-CFG.
index 4bafc5c..ff5173c 100644 (file)
--- a/SEMI-CFG
+++ b/SEMI-CFG
        "tm-plain" "tm-ps"
        "tmdecode"))
 
+(defvar PACKAGEDIR
+  (if (boundp 'early-packages)
+      (let ((dirs (append (if early-package-load-path
+                             early-packages)
+                         (if late-package-load-path
+                             late-packages)
+                         (if last-package-load-path
+                             last-packages)))
+           dir)
+       (while (not (file-exists-p
+                    (setq dir (car dirs))))
+         (setq dirs (cdr dirs)))
+       dir)))
+
 ;;; SEMI-CFG ends here
diff --git a/SEMI-MK b/SEMI-MK
index 5abe824..11c8137 100644 (file)
--- a/SEMI-MK
+++ b/SEMI-MK
@@ -1,7 +1,7 @@
 ;;; -*-Emacs-Lisp-*-
-;;;
-;;; $Id: SEMI-MK,v 1.2 1998-03-13 12:55:52 morioka Exp $
-;;;
+
+;; SEMI-MK: installer for SEMI.
+
 ;;; Code:
 
 (defun config-semi ()
@@ -51,4 +51,42 @@ LISPDIR=%s\n" PREFIX EXEC_PREFIX LISPDIR))
   (install-files METHODS METHOD_SRC_DIR METHOD_DIR nil t)
   )
 
+(defun config-semi-package ()
+  (let (package-dir)
+    (and (setq package-dir (car command-line-args-left))
+        (or (string= "NONE" package-dir)
+            (defvar PACKAGEDIR package-dir)
+            ))
+    (setq command-line-args-left (cdr command-line-args-left))
+    (load-file "SEMI-CFG")
+    (load-file "SEMI-ELS")
+                                         
+    (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR))
+    ))
+
+(defun compile-semi-package ()
+  (config-semi-package)
+
+  (setq autoload-package-name "semi")
+  (add-to-list 'command-line-args-left ".")
+  (batch-update-directory)
+
+  (add-to-list 'command-line-args-left ".")
+  (Custom-make-dependencies)
+
+  (compile-elisp-modules (append semi-modules-to-compile
+                                '(auto-autoloads custom-load))
+                        ".")
+  )
+
+(defun install-semi-package ()
+  (config-semi-package)
+  (install-elisp-modules (append semi-modules
+                                '(mime auto-autoloads custom-load))
+                        "./"
+                        (expand-file-name SEMI_PREFIX
+                                          (expand-file-name "lisp"
+                                                            PACKAGEDIR)))
+  )
+
 ;;; SEMI-MK ends here
diff --git a/VERSION b/VERSION
index c86d2cd..82dc986 100644 (file)
--- a/VERSION
+++ b/VERSION
 0.115  Hinomiko                \e$(BF|8f;R\e(B
 0.115.1        Oyanagi                 \e$(B>.Lx\e(B
 0.115.2        Inokuchi                \e$(B0f8}\e(B
-0.116  D\e-Dòhòji                       \e$(BF;K!;{\e(B\e-A
+0.116  D\e-Dòhòji\e-A                    \e$(BF;K!;{\e(B
 0.118  Sodani                  \e$(BA>C+\e(B
 0.118.1        Shijima                 \e$(B;M==K|\e(B
 0.118.2        Otomaru                 \e$(B254]\e(B
-1.0.0  Nukaj\e-Dþtaku-mae               \e$(B3[=;BpA0\e(B\e-A
+1.0.0  Nukaj\e-Dþtaku-mae\e-A            \e$(B3[=;BpA0\e(B
 1.0.1  Magae                   \e$(BGOBX\e(B
-1.0.2  Nonoichi-K\e-Dòdaimae    \e$(BLn!9;T9)BgA0\e(B\e-A
+1.0.2  Nonoichi-K\e-Dòdaimae\e-A \e$(BLn!9;T9)BgA0\e(B
 1.1.0  Nonoichi                \e$(BLn!9;T\e(B
 1.1.1  Oshino                  \e$(B2!Ln\e(B
 1.1.2  Shin-Nishikanazawa      \e$(B?7@>6bBt\e(B ; <=> JR \e$(B@>6bBt\e(B
 1.2.4  Arimagawa               \e$(BM-4V@n\e(B
 1.3.0  Nadachi                 \e$(BL>N)\e(B
 1.3.1  Tsutsuishi              \e$(BE{@P\e(B
-1.3.2  N\e-Dò                   \e$(BG=@8\e(B\e-A
+1.3.2  N\e-Dò\e-A                        \e$(BG=@8\e(B
 1.3.3  Uramoto                 \e$(B1:K\\e(B
 1.3.4  Kajiyashiki             \e$(B3a20I_\e(B
 1.4.0  Itoigawa                \e$(B;e5{@n\e(B           ; = JR \e$(BBg;e@~\e(B
-1.4.1  \e-DÒmi                  \e$(B@D3$\e(B\e-A
+1.4.1  \e-DÒmi\e-A                       \e$(B@D3$\e(B
 1.4.2  Oyashirazu              \e$(B?FITCN\e(B
 1.4.3  Ichiburi                \e$(B;T?6\e(B
-1.4.4  Ecch\e-Dþ-Miyazaki               \e$(B1[Cf5\:j\e(B\e-A
+1.4.4  Ecch\e-Dþ-Miyazaki\e-A            \e$(B1[Cf5\:j\e(B
 1.4.5  Tomari                  \e$(BGq\e(B
-1.4.6  Ny\e-Dþzen                       \e$(BF~A1\e(B\e-A
-1.5.0  Nishi-Ny\e-Dþzen         \e$(B@>F~A1\e(B\e-A
+1.4.6  Ny\e-Dþzen\e-A                    \e$(BF~A1\e(B
+1.5.0  Nishi-Ny\e-Dþzen\e-A              \e$(B@>F~A1\e(B
 1.5.1  Ikuji                   \e$(B@8CO\e(B
 1.5.2  Kurobe                  \e$(B9uIt\e(B
 1.5.3  Uozu                    \e$(B5{DE\e(B             ; <=> \e$(BIY;3COJ}E4F;\e(B
 1.8.0  Toyama                  \e$(BIY;3\e(B             ; = JR \e$(B9b;3K\@~!"IY;39A@~\e(B
 1.8.1  Kureha                  \e$(B8b1)\e(B
 1.8.2  Kosugi                  \e$(B>.?y\e(B
-1.8.3  Ecch\e-Dþ-Daimon         \e$(B1[CfBgLg\e(B\e-A
+1.8.3  Ecch\e-Dþ-Daimon\e-A              \e$(B1[CfBgLg\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
------  Fukuoka                 \e$(BJ!2,\e(B
+1.8.6  Fukuoka                 \e$(BJ!2,\e(B
 -----  Isurugi                 \e$(B@PF0\e(B
 -----  Kurikara                \e$(B6fMx2@Me\e(B
 -----  Tsubata                 \e$(BDEH(\e(B
@@ -76,7 +76,7 @@
 :      :                       :
 -------        Tsuruga                 \e$(BFX2l\e(B             ; = JR \e$(B>.IM@~\e(B
 -------        Shin-Hikida             \e$(B?7I%ED\e(B
--------        \e-DÒmi-Shiotsu          \e$(B6a9>1vDE\e(B ; = JR \e$(B8P@>@~\e(B\e-A
+-------        \e-DÒmi-Shiotsu\e-A               \e$(B6a9>1vDE\e(B ; = JR \e$(B8P@>@~\e(B
 -------        Yogo                    \e$(BM>8b\e(B
 -------        Kinomoto                \e$(BLZ%NK\\e(B
 -------        Takatsuki               \e$(B9b7n\e(B
 
 ;;-------------------------------------------------------------------------
 ;;     East Japan Railway      \e$(BElF|K\N95RE4F;\e(B   http://www.jreast.co.jp/
-;;     T\e-Dòkaidò Line         \e$(BEl3$F;K\@~\e(B\e-A
+;;     T\e-Dòkaidò\e-A Line              \e$(BEl3$F;K\@~\e(B
 ;;-------------------------------------------------------------------------
-1.2.0  T\e-Dòkyò                        \e$(BEl5~\e(B\e-A
+1.2.0  T\e-Dòkyò\e-A                     \e$(BEl5~\e(B
 1.2.1  Shinbashi               \e$(B?766\e(B     ; = JR \e$(B;3<j@~!"2#?\2l@~\e(B
 1.2.2  Shinagawa               \e$(BIJ@n\e(B     ; = JR \e$(B;3<j@~!"2#?\2l@~\e(B
 1.2.3  Kawasaki                \e$(B@n:j\e(B     ; = JR \e$(BFnIp@~\e(B
 1.2.4  Yokohama                \e$(B2#IM\e(B     ; = JR \e$(B5~IMElKL@~!&:,4_@~!"2#?\2l@~\e(B
 1.3.0  Totsuka                 \e$(B8MDM\e(B     ; = JR \e$(B2#?\2l@~\e(B
-1.3.1  \e-DÒfuna                        \e$(BBgA%\e(B     ; = JR \e$(B:,4_@~!"2#?\2l@~\e(B\e-A
+1.3.1  \e-DÒfuna\e-A                     \e$(BBgA%\e(B     ; = JR \e$(B:,4_@~!"2#?\2l@~\e(B
 1.4.0  Fujisawa                \e$(BF#Bt\e(B     ; <=> \e$(B>.ED5^EEE4\e(B \e$(B9>%NEg@~!"9>%NEgEEE4\e(B
-1.4.1  Tsujid\e-Dò                      \e$(@DT\e$(BF2\e(B ; \e$(B!J!V\e$(@DT\e$(B!W\e(B= J90@B-4454:128b\e$(B!K\e(B\e-A
+1.4.1  Tsujid\e-Dò\e-A                   \e$(@DT\e$(BF2\e(B ; \e$(B!J!V\e$(@DT\e$(B!W\e(B= J90@B-4454:128b\e$(B!K\e(B
 1.4.2  Chigasaki               \e$(B3}%v:j\e(B   ; = JR \e$(BAjLO@~\e(B
 1.4.3  Hiratsuka               \e$(BJ?DM\e(B
-1.4.4  \e-DÒiso                 \e$(BBg0k\e(B\e-A
+1.4.4  \e-DÒiso\e-A                      \e$(BBg0k\e(B
 1.4.5  Ninomiya                \e$(BFs5\\e(B
-1.4.6  K\e-Dòzu                 \e$(B9qI\DE\e(B   ; = JR \e$(B8fEB>l@~\e(B\e-A
+1.4.6  K\e-Dòzu\e-A                      \e$(B9qI\DE\e(B   ; = JR \e$(B8fEB>l@~\e(B
 1.5.0  Kamonomiya              \e$(B3{5\\e(B
 1.5.1  Odawara                 \e$(B>.ED86\e(B   ; <=> \e$(B>.ED5^!"H":,EP;3E4F;!"\e(B
                                        ;     \e$(B0KF&H":,E4F;\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$(BHxF,66\e(B\e-A
+-----  Ot\e-Dòbashi\e-A          \e$(BHxF,66\e(B
 -----  Nagoya                  \e$(BL>8E20\e(B   ; = JR \e$(B4X@>K\@~!J!&Cf1{K\@~!K\e(B
 :      :                       :
 -----  Gifu                    \e$(B4tIl\e(B     ; = JR \e$(B9b;3K\@~\e(B
 -----  Kusatsu                 \e$(BApDE\e(B     ; = JR \e$(BApDE@~\e(B
 :      :                       :
 -----  Yamashina               \e$(B;32J\e(B     ; = JR \e$(B8P@>@~\e(B
------  Ky\e-Dòto                        \e$(B5~ET\e(B     ; = JR \e$(BF`NI@~!&;31"K\@~\e(B\e-A
+-----  Ky\e-Dòto\e-A                     \e$(B5~ET\e(B     ; = JR \e$(BF`NI@~!&;31"K\@~\e(B
                                        ; <=> \e$(B6aE4\e(B \e$(B5~ET@~!"5~ET;T8rDL6I\e(B \e$(B1(4]@~\e(B
 :      :                       :
------  \e-DÒsaka                        \e$(BBg:e\e(B     ; = JR \e$(BBg:e4D>u@~\e(B <=> JR \e$(BEl@>@~\e(B \e$(BKL?7CO\e(B\e-A
+-----  \e-DÒsaka\e-A                     \e$(BBg:e\e(B     ; = JR \e$(BBg:e4D>u@~\e(B <=> JR \e$(BEl@>@~\e(B \e$(BKL?7CO\e(B
                                        ;   <=> \e$(BBg:e;T8rDL6I!":e?@!":e5^\e(B \e$(BG_ED\e(B
 :      :                       :
------  K\e-Dòbe                 \e$(B?@8M\e(B     ; = JR \e$(B;3M[K\@~\e(B\e-A
+-----  K\e-Dòbe\e-A                      \e$(B?@8M\e(B     ; = JR \e$(B;3M[K\@~\e(B
 
 
 [REMI version names]
 1.4.0  Himi                    \e$(BI98+\e(B
 1.5.0  Shimao                  \e$(BEgHx\e(B
 1.6.0  Amaharashi              \e$(B1+@2\e(B
-1.8.0  Ecch\e-Dþ-Kokubu         \e$(B1[Cf9qJ,\e(B\e-A
+1.8.0  Ecch\e-Dþ-Kokubu\e-A              \e$(B1[Cf9qJ,\e(B
 1.8.1  Fushiki                 \e$(BIzLZ\e(B     ; <=> \e$(B%&%i%8%*%9%C%H%C%/9RO)\e(B
-1.8.2  N\e-Dòmachi                      \e$(BG=D.\e(B\e-A
-1.8.3  Ecch\e-Dþ-Nakagawa               \e$(B1[CfCf@n\e(B\e-A
+1.8.2  N\e-Dòmachi\e-A                   \e$(BG=D.\e(B
+1.8.3  Ecch\e-Dþ-Nakagawa\e-A            \e$(B1[CfCf@n\e(B
 1.8.4  Takaoka                 \e$(B9b2,\e(B     ; = JR \e$(BKLN&K\@~!">kC<@~\e(B
 
 
 ;;     West Japan Railway      \e$(B@>F|K\N95RE4F;\e(B   http://www.westjr.co.jp/
 ;;     Kosei Line              \e$(B8P@>@~\e(B
 ;;-------------------------------------------------------------------------
--------        (\e-DÒmi-Shiotsu)                (\e$(B6a9>1vDE\e(B)       ; = JR \e$(BKLN&K\@~\e(B\e-A
+-------        (\e-DÒmi-Shiotsu)\e-A             (\e$(B6a9>1vDE\e(B)       ; = JR \e$(BKLN&K\@~\e(B
 :      :                       :
--------        Nishi-\e-DÒtsu           \e$(B@>BgDE\e(B\e-A
+-------        Nishi-\e-DÒtsu\e-A                \e$(B@>BgDE\e(B
        (Yamashina)             (\e$(B;32J\e(B)   ; = JR \e$(BEl3$F;K\@~\e(B
index 94ea968..1aa3c2f 100644 (file)
@@ -184,18 +184,11 @@ To insert a signature file automatically, call the function
      ("plain"
       ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
       )
-     ("richtext"
-      ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
-      )
-     ("enriched"
-      ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
-      )
-     ("x-latex"
-      ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
-      )
-     ("html"
-      ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8")
-      )
+     ("enriched")
+     ("html")
+     ("css") ; rfc2318
+     ("xml") ; rfc2376
+     ("x-latex")
      ("x-rot13-47-48")
      )
     ("message"
@@ -252,10 +245,6 @@ To insert a signature file automatically, call the function
      nil
      "inline"          (("filename" . file))
      )
-    ("\\.rtf$"
-     "text"    "richtext"      nil
-     nil
-     nil               nil)
     ("\\.html$"
      "text"    "html"          nil
      nil
@@ -568,30 +557,54 @@ If it is not specified for a major-mode,
 ;;; @@ optional header fields
 ;;;
 
-(defvar mime-edit-insert-x-emacs-field t
-  "*If non-nil, insert X-Emacs header field.")
-
-(defvar mime-edit-x-emacs-value
-  (if (featurep 'xemacs)
-      (concat emacs-version (if (featurep 'mule)
-                               " with mule"
-                             " without mule"))
-    (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
-                     (if enable-multibyte-characters
-                         (concat ", MULE " mule-version)
-                       " (with raw setting)")
-                     (if (featurep 'meadow)
-                         (concat ", " (Meadow-version))
-                       ))
-           (concat "MULE " mule-version " based on Emacs " ver))
-       ver)))
-  "Body of X-Emacs field.
-If variable `mime-edit-insert-x-emacs-field' is not nil, it is
+(defvar mime-edit-insert-user-agent-field t
+  "*If non-nil, insert User-Agent header field.")
+
+(defvar mime-edit-user-agent-value
+  (concat (car mime-user-interface-version)
+         "/"
+         (mapconcat #'number-to-string
+                    (cddr mime-user-interface-version) ".")
+         " ("
+         (cadr mime-user-interface-version)
+         ") "
+         (car mime-library-version)
+         "/"
+         (mapconcat #'number-to-string
+                    (cddr mime-library-version) ".")
+         " ("
+         (cadr mime-library-version)
+         ") "
+         (if (featurep 'xemacs)
+             (concat "XEmacs"
+                     (if (string-match "\\s +\\\"" emacs-version)
+                         (concat "/"
+                                 (substring emacs-version 0
+                                            (match-beginning 0))
+                                 " (" xemacs-codename ")")
+                       " (" emacs-version ")")
+                     (if (featurep 'mule) " MULE"))
+           (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
+                             (if enable-multibyte-characters
+                                 (concat " MULE/" mule-version)
+                               " (with unibyte mode)")
+                             (if (featurep 'meadow)
+                                 (let ((mver (Meadow-version)))
+                                   (if (string-match "^Meadow-" mver)
+                                       (concat " Meadow/"
+                                               (substring mver
+                                                          (match-end 0)))
+                                     ))))
+                   (concat "MULE/" mule-version
+                           " (based on Emacs " ver ")"))
+               ver))))
+  "Body of User-Agent field.
+If variable `mime-edit-insert-user-agent-field' is not nil, it is
 inserted into message header.")
 
 \f
@@ -1005,9 +1018,8 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
            (insert "\n")
            (forward-char -1)
            ))
-      (if (and (member (cadr ret) '("enriched" "richtext"))
-              (fboundp 'enriched-mode)
-              )
+      (if (and (member (cadr ret) '("enriched"))
+              (fboundp 'enriched-mode))
          (enriched-mode t)
        (if (boundp 'enriched-mode)
            (enriched-mode -1)
@@ -1854,10 +1866,10 @@ Content-Transfer-Encoding: 7bit
       (let ((contype (car ret))                ;Content-Type
            (encoding (nth 1 ret))      ;Content-Transfer-Encoding
            )
-       ;; Insert X-Emacs field
-       (and mime-edit-insert-x-emacs-field
-            (or (mail-position-on-field "X-Emacs")
-                (insert mime-edit-x-emacs-value)
+       ;; Insert User-Agent field
+       (and mime-edit-insert-user-agent-field
+            (or (mail-position-on-field "User-Agent")
+                (insert mime-edit-user-agent-value)
                 ))
        ;; Make primary MIME headers.
        (or (mail-position-on-field "MIME-Version")
@@ -2509,7 +2521,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 
 (defvar mime-edit-again-ignored-field-regexp
   (concat "^\\(" "Content-.*\\|Mime-Version"
-         (if mime-edit-insert-x-emacs-field "\\|X-Emacs")
+         (if mime-edit-insert-user-agent-field "\\|User-Agent")
          "\\):")
   "Regexp for deleted header fields when `mime-edit-again' is called.")
 
index deb6ca4..4027c0d 100644 (file)
@@ -29,7 +29,7 @@
 (eval-when-compile (require 'cl))
 
 
-(defconst mime-user-interface-version '("WEMI" "Higashi-Tagonoura" 1 8 5)
+(defconst mime-user-interface-version '("WEMI" "Yoshiwara" 1 8 6)
   "Implementation name, version name and numbers of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"