From 9c0a3b6fa33a1b1b856df474dcc7cc49b4d8e660 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 16 Sep 1998 10:49:14 +0000 Subject: [PATCH] WEMI 1.8.6 (Yoshiwara): Sync up with SEMI 1.8.6 (Fukuoka). --- ChangeLog | 67 ++++++++++++++++++++++++++++++++---- Makefile | 45 +++++++++--------------- README.en | 43 ++++++++++++++++++++++- SEMI-CFG | 14 ++++++++ SEMI-MK | 44 ++++++++++++++++++++++-- VERSION | 72 ++++++++++++++++++++++++--------------- mime-edit.el | 108 ++++++++++++++++++++++++++++++++-------------------------- semi-def.el | 2 +- 8 files changed, 280 insertions(+), 115 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7efe51a..9680ab0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,58 @@ +1998-09-16 Katsumi Yamaoka + + * WEMI: Version 1.8.6 (Yoshiwara) released. + +1998-09-15 MORIOKA Tomohiko + + * 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 + + * 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 + + * 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 + + * 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 + + * 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. + + 1998-09-01 Katsumi Yamaoka * WEMI: Version 1.8.5 (Higashi-Tagonoura) released. @@ -69,7 +124,7 @@ 1998-07-08 MORIOKA Tomohiko - * REMI: Version 1.8.3 (Ecch-Dþ-Nakagawa) released.-A + * REMI: Version 1.8.3 (Ecch-Dþ-Nakagawa)-A released. * mime-play.el (mime-delq-null-situation): Add new optional argument `ignored-value'. @@ -98,7 +153,7 @@ 1998-07-08 MORIOKA Tomohiko - * REMI: Version 1.8.2 (N-Dòmachi) released.-A + * REMI: Version 1.8.2 (N-Dòmachi)-A released. 1998-07-07 MORIOKA Tomohiko @@ -219,7 +274,7 @@ 1998-06-28 MORIOKA Tomohiko - * REMI: Version 1.8.0 (Ecch-Dþ-Kokubu) released.-A + * REMI: Version 1.8.0 (Ecch-Dþ-Kokubu)-A released. 1998-06-26 MORIOKA Tomohiko @@ -2294,7 +2349,7 @@ 1998-03-13 MORIOKA Tomohiko - * SEMI: Version 1.0.2 (Nonoichi-K-Dòdaimae) was released.-A + * SEMI: Version 1.0.2 (Nonoichi-K-Dòdaimae)-A was released. 1998-03-12 MORIOKA Tomohiko @@ -2406,7 +2461,7 @@ 1998-02-25 MORIOKA Tomohiko - * SEMI: Version 1.0.0 (Nukaj-Dþtaku-mae) was released.-A + * SEMI: Version 1.0.0 (Nukaj-Dþtaku-mae)-A was released. * SEMI-ELS: Remove mime-tar.el. @@ -2543,7 +2598,7 @@ 1997-11-16 MORIOKA Tomohiko - * SEMI: Version 0.116 (D-Dòhòji) was released.-A + * SEMI: Version 0.116 (D-Dòhòji)-A was released. 1997-11-15 MORIOKA Tomohiko diff --git a/Makefile b/Makefile index 4ded509..2e6b3d6 100644 --- 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: diff --git a/README.en b/README.en index 4c12700..a9ff771 100644 --- 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. diff --git a/SEMI-CFG b/SEMI-CFG index 4bafc5c..ff5173c 100644 --- a/SEMI-CFG +++ b/SEMI-CFG @@ -163,4 +163,18 @@ "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 --- 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 --- a/VERSION +++ b/VERSION @@ -18,13 +18,13 @@ 0.115 Hinomiko $(BF|8f;R(B 0.115.1 Oyanagi $(B>.Lx(B 0.115.2 Inokuchi $(B0f8}(B -0.116 D-Dòhòji $(BF;K!;{(B-A +0.116 D-Dòhòji-A $(BF;K!;{(B 0.118 Sodani $(BA>C+(B 0.118.1 Shijima $(B;M==K|(B 0.118.2 Otomaru $(B254](B -1.0.0 Nukaj-Dþtaku-mae $(B3[=;BpA0(B-A +1.0.0 Nukaj-Dþtaku-mae-A $(B3[=;BpA0(B 1.0.1 Magae $(BGOBX(B -1.0.2 Nonoichi-K-Dòdaimae $(BLn!9;T9)BgA0(B-A +1.0.2 Nonoichi-K-Dòdaimae-A $(BLn!9;T9)BgA0(B 1.1.0 Nonoichi $(BLn!9;T(B 1.1.1 Oshino $(B2!Ln(B 1.1.2 Shin-Nishikanazawa $(B?7@>6bBt(B ; <=> JR $(B@>6bBt(B @@ -40,17 +40,17 @@ 1.2.4 Arimagawa $(BM-4V@n(B 1.3.0 Nadachi $(BL>N)(B 1.3.1 Tsutsuishi $(BE{@P(B -1.3.2 N-Dò $(BG=@8(B-A +1.3.2 N-Dò-A $(BG=@8(B 1.3.3 Uramoto $(B1:K\(B 1.3.4 Kajiyashiki $(B3a20I_(B 1.4.0 Itoigawa $(B;e5{@n(B ; = JR $(BBg;e@~(B -1.4.1 -DÒmi $(B@D3$(B-A +1.4.1 -DÒmi-A $(B@D3$(B 1.4.2 Oyashirazu $(B?FITCN(B 1.4.3 Ichiburi $(B;T?6(B -1.4.4 Ecch-Dþ-Miyazaki $(B1[Cf5\:j(B-A +1.4.4 Ecch-Dþ-Miyazaki-A $(B1[Cf5\:j(B 1.4.5 Tomari $(BGq(B -1.4.6 Ny-Dþzen $(BF~A1(B-A -1.5.0 Nishi-Ny-Dþzen $(B@>F~A1(B-A +1.4.6 Ny-Dþzen-A $(BF~A1(B +1.5.0 Nishi-Ny-Dþzen-A $(B@>F~A1(B 1.5.1 Ikuji $(B@8CO(B 1.5.2 Kurobe $(B9uIt(B 1.5.3 Uozu $(B5{DE(B ; <=> $(BIY;3COJ}E4F;(B @@ -61,10 +61,10 @@ 1.8.0 Toyama $(BIY;3(B ; = JR $(B9b;3K\@~!"IY;39A@~(B 1.8.1 Kureha $(B8b1)(B 1.8.2 Kosugi $(B>.?y(B -1.8.3 Ecch-Dþ-Daimon $(B1[CfBgLg(B-A +1.8.3 Ecch-Dþ-Daimon-A $(B1[CfBgLg(B 1.8.4 Takaoka $(B9b2,(B ; = JR $(BI98+@~!">kC<@~(B 1.8.5 Nishi-Takaoka $(B@>9b2,(B ------ Fukuoka $(BJ!2,(B +1.8.6 Fukuoka $(BJ!2,(B ----- Isurugi $(B@PF0(B ----- Kurikara $(B6fMx2@Me(B ----- Tsubata $(BDEH((B @@ -76,7 +76,7 @@ : : : ------- Tsuruga $(BFX2l(B ; = JR $(B>.IM@~(B ------- Shin-Hikida $(B?7I%ED(B -------- -DÒmi-Shiotsu $(B6a9>1vDE(B ; = JR $(B8P@>@~(B-A +------- -DÒmi-Shiotsu-A $(B6a9>1vDE(B ; = JR $(B8P@>@~(B ------- Yogo $(BM>8b(B ------- Kinomoto $(BLZ%NK\(B ------- Takatsuki $(B9b7n(B @@ -92,22 +92,22 @@ ;;------------------------------------------------------------------------- ;; East Japan Railway $(BElF|K\N95RE4F;(B http://www.jreast.co.jp/ -;; T-Dòkaidò Line $(BEl3$F;K\@~(B-A +;; T-Dòkaidò-A Line $(BEl3$F;K\@~(B ;;------------------------------------------------------------------------- -1.2.0 T-Dòkyò $(BEl5~(B-A +1.2.0 T-Dòkyò-A $(BEl5~(B 1.2.1 Shinbashi $(B?766(B ; = JR $(B;3 $(B>.ED5^EEE4(B $(B9>%NEg@~!"9>%NEgEEE4(B -1.4.1 Tsujid-Dò $(@DT$(BF2(B ; $(B!J!V$(@DT$(B!W(B= J90@B-4454:128b$(B!K(B-A +1.4.1 Tsujid-Dò-A $(@DT$(BF2(B ; $(B!J!V$(@DT$(B!W(B= J90@B-4454:128b$(B!K(B 1.4.2 Chigasaki $(B3}%v:j(B ; = JR $(BAjLO@~(B 1.4.3 Hiratsuka $(BJ?DM(B -1.4.4 -DÒiso $(BBg0k(B-A +1.4.4 -DÒiso-A $(BBg0k(B 1.4.5 Ninomiya $(BFs5\(B -1.4.6 K-Dòzu $(B9qI\DE(B ; = JR $(B8fEB>l@~(B-A +1.4.6 K-Dòzu-A $(B9qI\DE(B ; = JR $(B8fEB>l@~(B 1.5.0 Kamonomiya $(B3{5\(B 1.5.1 Odawara $(B>.ED86(B ; <=> $(B>.ED5^!"H":,EP;3E4F;!"(B ; $(B0KF&H":,E4F;(B @@ -125,11 +125,29 @@ 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 $(BHxF,66(B-A +----- Ot-Dòbashi-A $(BHxF,66(B ----- Nagoya $(BL>8E20(B ; = JR $(B4X@>K\@~!J!&Cf1{K\@~!K(B : : : ----- Gifu $(B4tIl(B ; = JR $(B9b;3K\@~(B @@ -143,13 +161,13 @@ ----- Kusatsu $(BApDE(B ; = JR $(BApDE@~(B : : : ----- Yamashina $(B;32J(B ; = JR $(B8P@>@~(B ------ Ky-Dòto $(B5~ET(B ; = JR $(BF`NI@~!&;31"K\@~(B-A +----- Ky-Dòto-A $(B5~ET(B ; = JR $(BF`NI@~!&;31"K\@~(B ; <=> $(B6aE4(B $(B5~ET@~!"5~ET;T8rDL6I(B $(B1(4]@~(B : : : ------ -DÒsaka $(BBg:e(B ; = JR $(BBg:e4D>u@~(B <=> JR $(BEl@>@~(B $(BKL?7CO(B-A +----- -DÒsaka-A $(BBg:e(B ; = JR $(BBg:e4D>u@~(B <=> JR $(BEl@>@~(B $(BKL?7CO(B ; <=> $(BBg:e;T8rDL6I!":e?@!":e5^(B $(BG_ED(B : : : ------ K-Dòbe $(B?@8M(B ; = JR $(B;3M[K\@~(B-A +----- K-Dòbe-A $(B?@8M(B ; = JR $(B;3M[K\@~(B [REMI version names] @@ -161,10 +179,10 @@ 1.4.0 Himi $(BI98+(B 1.5.0 Shimao $(BEgHx(B 1.6.0 Amaharashi $(B1+@2(B -1.8.0 Ecch-Dþ-Kokubu $(B1[Cf9qJ,(B-A +1.8.0 Ecch-Dþ-Kokubu-A $(B1[Cf9qJ,(B 1.8.1 Fushiki $(BIzLZ(B ; <=> $(B%&%i%8%*%9%C%H%C%/9RO)(B -1.8.2 N-Dòmachi $(BG=D.(B-A -1.8.3 Ecch-Dþ-Nakagawa $(B1[CfCf@n(B-A +1.8.2 N-Dòmachi-A $(BG=D.(B +1.8.3 Ecch-Dþ-Nakagawa-A $(B1[CfCf@n(B 1.8.4 Takaoka $(B9b2,(B ; = JR $(BKLN&K\@~!">kC<@~(B @@ -174,7 +192,7 @@ ;; West Japan Railway $(B@>F|K\N95RE4F;(B http://www.westjr.co.jp/ ;; Kosei Line $(B8P@>@~(B ;;------------------------------------------------------------------------- -------- (-DÒmi-Shiotsu) ($(B6a9>1vDE(B) ; = JR $(BKLN&K\@~(B-A +------- (-DÒmi-Shiotsu)-A ($(B6a9>1vDE(B) ; = JR $(BKLN&K\@~(B : : : -------- Nishi--DÒtsu $(B@>BgDE(B-A +------- Nishi--DÒtsu-A $(B@>BgDE(B (Yamashina) ($(B;32J(B) ; = JR $(BEl3$F;K\@~(B diff --git a/mime-edit.el b/mime-edit.el index 94ea968..1aa3c2f 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -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.") @@ -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.") diff --git a/semi-def.el b/semi-def.el index deb6ca4..4027c0d 100644 --- a/semi-def.el +++ b/semi-def.el @@ -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" -- 1.7.10.4