(mime-edit-mime-version-field-for-message/partial):
authorhayashi <hayashi>
Wed, 14 Jun 2000 03:27:20 +0000 (03:27 +0000)
committerhayashi <hayashi>
Wed, 14 Jun 2000 03:27:20 +0000 (03:27 +0000)
Add an accidentally removed newline.
* mime-edit.el (mime-edit-yank-ignored-field-regexp): Removed.
(mime-edit-yank-ignored-field-list): Make this customizable.

ChangeLog
VERSION
emy.texi
mime-edit.el
semi-def.el

index 0372f12..aae5995 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-06-13  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+       * mime-edit.el (mime-transfer-level): Defcustomize.
+       (mime-edit-mime-version-field-for-message/partial):
+       Add an accidentally removed newline.
+
+2000-06-07  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+       * mime-edit.el (mime-edit-yank-ignored-field-regexp): Removed.
+       (mime-edit-yank-ignored-field-list): Make this customizable.
+
 2000-06-09   Daiki Ueno  <ueno@unixuser.org>
 
        * mime-edit.el (mime-edit-insert-key): Insert a text tag when
diff --git a/VERSION b/VERSION
index 9c1fa27..b29cf0e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,228 +1,9 @@
-[SEMI Version names]
+[EMY Version names]
 
-0.72   --------                --------
-0.75   --------                --------
-0.83   --------                --------
-0.87   --------                --------
-0.88   --------                --------
-0.91   --------                --------
-0.92   --------                --------
 
-;;-------------------------------------------------------------------------
-;;     Hokuriku Railway        \e$(BKLN&E4F;\e(B
-;;     Ishikawa Line           \e$(B@P@n@~\e(B
-;;-------------------------------------------------------------------------
-0.96   Kaga-Ichinomiya         \e$(B2C2l0l$N5\\e(B       ; \e$(B!JGr;3Hf\e$(D5/\e$(B?@<R!K\e(B
-0.97   Naka-Tsurugi            \e$(BCfDaMh\e(B
-0.112  Tsurugi                 \e$(BDaMh\e(B             ; <=> \e$(B$8$c$$%P%9\e(B
-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-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-A            \e$(B3[=;BpA0\e(B
-1.0.1  Magae                   \e$(BGOBX\e(B
-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.0  Nishiizumi              \e$(B@>@t\e(B
-1.2.1  Nomachi                 \e$(BLnD.\e(B
-
-;;-------------------------------------------------------------------------
-;;     West Japan Railway      \e$(B@>F|K\N95RE4F;\e(B   http://www.westjr.co.jp/
-;;     Hokuriku Line           \e$(BKLN&K\@~\e(B
-;;-------------------------------------------------------------------------
-1.2.2  Naoetsu                 \e$(BD>9>DE\e(B           ; = JR \e$(B?.1[K\@~\e(B
-1.2.3  Tanihama                \e$(BC+IM\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-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-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-A            \e$(B1[Cf5\:j\e(B
-1.4.5  Tomari                  \e$(BGq\e(B
-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.5.4  Higashi-Namerikawa      \e$(BEl3j@n\e(B
-1.6.0  Namerikawa              \e$(B3j@n\e(B             ; <=> \e$(BIY;3COJ}E4F;\e(B
-1.7.0  Mizuhashi               \e$(B?e66\e(B
-1.7.1  Higashi-Toyama          \e$(BElIY;3\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-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
-1.8.6  Fukuoka                 \e$(BJ!2,\e(B
-1.9.0  Isurugi                 \e$(B@PF0\e(B
-1.9.1  Kurikara                \e$(B6fMx2@Me\e(B
-1.10.0 Tsubata                 \e$(BDEH(\e(B
-1.10.1 Morimoto                \e$(B?9K\\e(B
-1.10.2 Higashi-Kanazawa        \e$(BEl6bBt\e(B
-1.11.0 Kanazawa                \e$(B6bBt\e(B             ; <=> \e$(BKLN&E4F;\e(B \e$(BKLE46bBt\e(B
-1.12.0 Nishi-Kanazawa          \e$(B@>6bBt\e(B           ; <=> \e$(BKLN&E4F;\e(B \e$(B?7@>6bBt\e(B
-1.12.1 [JR] Nonoichi           [JR] \e$(BLn!9;T\e(B
-1.13.0 Matt\e-Dò\e-A                     \e$(B>>G$\e(B
-1.13.1 Kaga-Kasama             \e$(B2C2l3^4V\e(B
-1.13.2 Mikawa                  \e$(BH~@n\e(B
-1.13.3 Komaiko                 \e$(B>.Iq;R\e(B
-1.13.4 Terai                   \e$(B;{0f\e(B
-1.13.5 Meih\e-Dò\e-A                     \e$(BL@Jv\e(B
-1.13.6 Komatsu                 \e$(B>.>>\e(B
-1.13.7 Awazu                   \e$(B0@DE\e(B
-:      :                       :
--------        Tsuruga                 \e$(BFX2l\e(B             ; = JR \e$(B>.IM@~\e(B
--------        Shin-Hikida             \e$(B?7I%ED\e(B
--------        \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
--------        Kawake                  \e$(B2OLS\e(B
--------        Torahime                \e$(B8WI1\e(B
--------        Nagahama                \e$(BD9IM\e(B
-------- Tamura                 \e$(BEDB<\e(B
--------        Sakata                  \e$(B:dED\e(B
-       (Maibara)               (\e$(BJF86\e(B)           ; = JR \e$(BEl3$F;K\@~\e(B
-
-
-[WEMI version names]
-
-;;-------------------------------------------------------------------------
-;;     East Japan Railway      \e$(BElF|K\N95RE4F;\e(B   http://www.jreast.co.jp/
-;;     T\e-Dòkaidò\e-A Line              \e$(BEl3$F;K\@~\e(B
-;;-------------------------------------------------------------------------
-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-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-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-A                      \e$(BBg0k\e(B
-1.4.5  Ninomiya                \e$(BFs5\\e(B
-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.5.2  Hayakawa                \e$(BAa@n\e(B
-1.5.3  Nebukawa                \e$(B:,I\@n\e(B
-1.5.4  Manazuru                \e$(B??Da\e(B
-1.6.0  Yugawara                \e$(BEr2O86\e(B
-1.7.0  Atami                   \e$(BG.3$\e(B     ; = JR \e$(B0KEl@~\e(B
-;;-------------------------------------------------------------------------
-;;     Central Japan Railway   \e$(BEl3$N95RE4F;\e(B
-;;-------------------------------------------------------------------------
-1.7.1  Kan'nami                \e$(BH!Fn\e(B
-1.8.0  Mishima                 \e$(B;0Eg\e(B     ; = \e$(B0KF&H":,E4F;\e(B
-1.8.1  Numazu                  \e$(B>BDE\e(B     ; = JR \e$(B8fEB>l@~\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
-1.8.6  Yoshiwara               \e$(B5H86\e(B     ; = \e$(B3YFnE4F;\e(B
-1.9.0  Fuji                    \e$(BIY;N\e(B     ; = JR \e$(B?H1d@~\e(B
-1.9.1  Fujikawa                \e$(BIY;N@n\e(B
-1.10.0 Shin-Kambara            \e$(B?73w86\e(B
-1.10.1 Kambara                 \e$(B3w86\e(B
-1.10.2 Yui                     \e$(BM3Hf\e(B
-1.11.0 Okitsu                  \e$(B6=DE\e(B
-1.12.0 Shimizu                 \e$(B@6?e\e(B
-1.12.1 Kusanagi                \e$(BApFe\e(B
-1.13.0 Shizuoka                \e$(B@E2,\e(B
-1.13.1 Abekawa                 \e$(B0BG\@n\e(B
-1.13.2 Mochimune               \e$(BMQ=!\e(B
-1.13.3 Yaizu                   \e$(B>FDE\e(B
-1.13.4 Nishi-Yaizu             \e$(B@>>FDE\e(B
-1.13.5 Fijieda                 \e$(BF#;^\e(B
-1.13.6 Rokug\e-Dò\e-A                    \e$(BO;9g\e(B
-1.13.7 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
------- Fukuroi                 \e$(BB^0f\e(B
------- Iwata                   \e$(BHXED\e(B
------- Toyodach\e-Dò\e-A         \e$(BK-EDD.\e(B
------- Tenry\e-Dþgawa\e-A                \e$(BE7N5@n\e(B
------- Hamamatsu               \e$(BIM>>\e(B     ; = \e$(B1s=#E4F;\e(B
------- Takatsuka               \e$(B9bDM\e(B
------- Maisaka                 \e$(BIq:e\e(B
------- Bentenjima              \e$(BJ[E7Eg\e(B
------- Araimachi               \e$(B?75oD.\e(B
------- Wasizu                  \e$(BOIDE\e(B
------- Shinjohara              \e$(B?7=j86\e(B   ; = \e$(BE7N5IML>8PE4F;\e(B
------- Futagawa                \e$(BFs2O\e(B
------- Toyohashi               \e$(BK-66\e(B     ; = JR \e$(BHSED@~\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
------- 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
-:      :                       :
------- Samegai                 \e$(B@C%v0f\e(B
-;;-------------------------------------------------------------------------
-;;     West Japan Railway      \e$(B@>F|K\N95RE4F;\e(B   http://www.westjr.co.jp/
-;;-------------------------------------------------------------------------
------- Maibara                 \e$(BJF86\e(B     ; = JR \e$(BKLN&K\@~\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-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-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-A                      \e$(B?@8M\e(B     ; = JR \e$(B;3M[K\@~\e(B
-
-
-[REMI version names]
-
-;;-------------------------------------------------------------------------
-;;     West Japan Railway      \e$(B@>F|K\N95RE4F;\e(B   http://www.westjr.co.jp/
-;;     Himi Line               \e$(BI98+@~\e(B
-;;-------------------------------------------------------------------------
-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-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-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
-
-;;-------------------------------------------------------------------------
-;;     Hokuetsu Express        \e$(BKL1[5^9T\e(B
-;;             http://www.tiara.or.jp/~tokamaci/hokuhoku/hokuhoku.html
-;;     Hokuhoku Line           \e$(B$[$/$[$/@~\e(B
-;;-------------------------------------------------------------------------
-1.13.0 Saigata                 \e$(B:T3c\e(B     ; = JR \e$(B?.1[K\@~\e(B
-1.13.1 Kubiki                  \e$(B$/$S$-\e(B
-1.13.2 \e-DÒike-Ikoinomori\e-A           \e$(BBgCS$$$3$$$N?9\e(B
-
-
-[etc.]
-
-;;-------------------------------------------------------------------------
-;;     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-A             (\e$(B6a9>1vDE\e(B)       ; = JR \e$(BKLN&K\@~\e(B
-:      :                       :
--------        Nishi-\e-DÒtsu\e-A                \e$(B@>BgDE\e(B
-       (Yamashina)             (\e$(B;32J\e(B)   ; = JR \e$(BEl3$F;K\@~\e(B
+1.13.0  No pain no gain
+1.13.1  Haste make waste
+1.13.2  Better late than never
+1.13.4  To err is human
+1.13.5  Time flies
+1.13.6  Life is balance
index 8e41389..a76a8e3 100644 (file)
--- a/emy.texi
+++ b/emy.texi
@@ -122,7 +122,7 @@ try persuading me.  Warning: `It's de facto standard' is not enough.
 @end menu
 
 @node Content-Type
-@subsection How things are interpretes with each types
+@subsection How things are interpreted with each types
 
 @node Overview
 @chapter Some basic things about EMY
@@ -134,16 +134,16 @@ try persuading me.  Warning: `It's de facto standard' is not enough.
 @end menu
 
 @node Customize
-@section What you should care
+@section What you should care about
 
 @node MIME-View
 @chapter Viewing MIME messages
 
-Right now only differences between SEMI and EMY are documented.
+Right now, only differences between SEMI and EMY are documented.
 
 @menu
-* Manipulating an Entity::      Changing representation of the part
-* Changing Entity Button::      Where to add button indicating that entity.
+* Manipulating an Entity::      Changing representation of a part.
+* Changing Entity Buttons::     Where to add button indicating that entity.
 * Adding Buttons::              Where you want to see buttons.
 * How to deal with broken MUA:: Some MUA sends totally broken messages.
 @end menu
@@ -217,10 +217,20 @@ Toggle display of entity body.
 
 @end table
 
-@node Changing Entity Button
+@node Changing Entity Buttons
 @section How buttons look like
 
-Not yet written.
+@vindex mime-use-widget
+Before EMY 1.13.6, you need W- variants of SEMI to show buttons using
+widgets.  From now on, you only need to set @code{mime-use-widget}
+to @code{t}.
+
+Information of a part is displayed in buttons.  What will be shown is
+already defined.
+
+[You should be able to customize button with format string.
+ This might be implemented in later versions.  If you
+ want it, speak up!]
 
 @node Adding Buttons
 @section Add button before, after or around an entity
index 0b953ad..ca2fd91 100644 (file)
 
 ;;; Code:
 
+(eval-when-compile (require 'static))
+
 (require 'sendmail)
 (require 'mail-utils)
 (require 'mel)
@@ -482,8 +484,13 @@ either type/subtype or type only."
     (iso-2022-jp-2     7 "base64")
     (iso-2022-int-1    7 "base64")))
 
-(defvar mime-transfer-level 7
-  "*A number of network transfer level.  It should be bigger than 7.")
+(defcustom mime-transfer-level 7
+  "*A number of network transfer level.  It should be bigger than 7.
+Currently it has no effect except mode-line display."
+  :group 'mime-edit
+  :type '(choice (const 7)
+                (const 8)
+                (const :tag "Binary" 9)))
 (make-variable-buffer-local 'mime-transfer-level)
 
 (defsubst mime-encoding-name (transfer-level &optional not-omit)
@@ -504,16 +511,13 @@ either type/subtype or type only."
 ;;; @@ about message inserting
 ;;;
 
-(defvar mime-edit-yank-ignored-field-list
+(defcustom mime-edit-yank-ignored-field-list
   '("Received" "Approved" "Path" "Replied" "Status"
     "Xref" "X-UIDL" "X-Filter" "X-Gnus-.*" "X-VM-.*")
   "List of ignored header fields when inserting message/rfc822.
-Each elements are regexp of field-name.")
-
-(defvar mime-edit-yank-ignored-field-regexp
-  (concat "^"
-         (apply (function regexp-or) mime-edit-yank-ignored-field-list)
-         ":"))
+Each elements are regexp of field-name."
+  :group 'mime-edit
+  :type '(repeat regexp))
 
 (defvar mime-edit-message-inserter-alist nil)
 (defvar mime-edit-mail-inserter-alist nil)
@@ -581,11 +585,11 @@ If it is not specified for a `major-mode',
             mime-edit-multipart-beginning-regexp
             mime-edit-multipart-end-regexp))
 
-(defvar mime-tag-format "--[[%s]]"
-  "*Control-string making a MIME tag.")
+(defconst mime-tag-format "--[[%s]]"
+  "Control-string making a MIME tag.")
 
-(defvar mime-tag-format-with-encoding "--[[%s][%s]]"
-  "*Control-string making a MIME tag with encoding.")
+(defconst mime-tag-format-with-encoding "--[[%s][%s]]"
+  "Control-string making a MIME tag with encoding.")
 
 
 ;;; @@ multipart boundary
@@ -669,7 +673,7 @@ inserted into message header.")
 ;;;
 
 (defconst mime-tspecials-regexp "[][()<>@,;:\\\"/?.= \t]"
-  "*Specify MIME tspecials.
+  "Specify MIME tspecials.
 Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-edit-mime-version-value
@@ -678,7 +682,7 @@ Tspecials means any character that matches with it in header must be quoted.")
   "MIME version number.")
 
 (defconst mime-edit-mime-version-field-for-message/partial
-  "MIME-Version: 1.0"
+  "MIME-Version: 1.0\n"
 ;;  (concat "MIME-Version:"
 ;;       (eword-encode-field-body
 ;;        (concat " 1.0 (split by " mime-edit-version ")\n")
@@ -774,43 +778,44 @@ Tspecials means any character that matches with it in header must be quoted.")
     (level     "Toggle transfer-level" mime-edit-toggle-transfer-level))
   "MIME-edit menubar entry.")
 
-(cond ((featurep 'xemacs)
+(static-if (featurep 'xemacs)
        ;; modified by Pekka Marjola <pema@iki.fi>
        ;;      1995/9/5 (c.f. [tm-en:69])
-       (defun mime-edit-define-menu-for-xemacs ()
-        "Define menu for XEmacs."
-        (cond ((featurep 'menubar)
-               (make-local-variable 'current-menubar)
-               (set-buffer-menubar current-menubar)
-               (add-submenu
-                nil
-                (cons mime-edit-menu-title
-                      (mapcar (function
-                               (lambda (item)
-                                 (vector (nth 1 item)(nth 2 item)
-                                         mime-edit-mode-flag)))
-                              mime-edit-menu-list))))))
-
-       ;; modified by Steven L. Baur <steve@miranova.com>
-       ;;      1995/12/6 (c.f. [tm-en:209])
-       (or (boundp 'mime-edit-popup-menu-for-xemacs)
-          (setq mime-edit-popup-menu-for-xemacs
-                (append '("MIME Commands" "---")
-                        (mapcar (function (lambda (item)
-                                            (vector (nth 1 item)
-                                                    (nth 2 item)
-                                                    t)))
-                                mime-edit-menu-list)))))
-      ((>= emacs-major-version 19)
-       (define-key mime-edit-mode-map [menu-bar mime-edit]
-        (cons mime-edit-menu-title
-              (make-sparse-keymap mime-edit-menu-title)))
-       (mapcar (function
-               (lambda (item)
-                 (define-key mime-edit-mode-map
-                   (vector 'menu-bar 'mime-edit (car item))
-                   (cons (nth 1 item)(nth 2 item)))))
-              (reverse mime-edit-menu-list))))
+    (progn
+      (defun mime-edit-define-menu-for-xemacs ()
+       "Define menu for XEmacs."
+       (cond ((featurep 'menubar)
+              (make-local-variable 'current-menubar)
+              (set-buffer-menubar current-menubar)
+              (add-submenu
+               nil
+               (cons mime-edit-menu-title
+                     (mapcar (function
+                              (lambda (item)
+                                (vector (nth 1 item)(nth 2 item)
+                                        mime-edit-mode-flag)))
+                             mime-edit-menu-list))))))
+      ;; modified by Steven L. Baur <steve@miranova.com>
+      ;;       1995/12/6 (c.f. [tm-en:209])
+      (or (boundp 'mime-edit-popup-menu-for-xemacs)
+         (setq mime-edit-popup-menu-for-xemacs
+               (append '("MIME Commands" "---")
+                       (mapcar (function (lambda (item)
+                                           (vector (nth 1 item)
+                                                   (nth 2 item)
+                                                   t)))
+                               mime-edit-menu-list)))))
+      ;; Bogus check.  Nemacs is not supported.
+      ;;(>= emacs-major-version 19)
+  (define-key mime-edit-mode-map [menu-bar mime-edit]
+    (cons mime-edit-menu-title
+         (make-sparse-keymap mime-edit-menu-title)))
+  (mapcar (function
+          (lambda (item)
+            (define-key mime-edit-mode-map
+              (vector 'menu-bar 'mime-edit (car item))
+              (cons (nth 1 item)(nth 2 item)))))
+         (reverse mime-edit-menu-list)))
 
 ;;; @ macros
 ;;;
@@ -944,7 +949,7 @@ User customizable variables (not documented all of them):
 
  mime-transfer-level
     A number of network transfer level.  It should be bigger than 7.
-    If you are in 8bit-through environment, please set 8.
+    If you are in 8bit-through environment, please set to 8.
 
  mime-edit-voice-recorder
     Specifies a function to record a voice message and encode it.
@@ -974,19 +979,18 @@ User customizable variables (not documented all of them):
       (turn-on-mime-edit))))
 
 
-(cond ((featurep 'xemacs)
-       (add-minor-mode 'mime-edit-mode-flag
-                      '((" MIME-Edit "  mime-transfer-level-string))
-                      mime-edit-mode-map
-                      nil
-                      'mime-edit-mode))
-      (t
-       (set-alist 'minor-mode-alist
-                 'mime-edit-mode-flag
-                 '((" MIME-Edit "  mime-transfer-level-string)))
-       (set-alist 'minor-mode-map-alist
-                 'mime-edit-mode-flag
-                 mime-edit-mode-map)))
+(static-if (featurep 'xemacs)
+    (add-minor-mode 'mime-edit-mode-flag
+                   '((" MIME-Edit "  mime-transfer-level-string))
+                   mime-edit-mode-map
+                   nil
+                   'mime-edit-mode)
+  (set-alist 'minor-mode-alist
+            'mime-edit-mode-flag
+            '((" MIME-Edit "  mime-transfer-level-string)))
+  (set-alist 'minor-mode-map-alist
+            'mime-edit-mode-flag
+            mime-edit-mode-map))
 
 
 ;;;###autoload
@@ -2233,7 +2237,10 @@ and insert data encoded as ENCODING."
            (narrow-to-region header-start (match-beginning 0)))
        (goto-char header-start)
        (while (and (re-search-forward
-                    mime-edit-yank-ignored-field-regexp nil t)
+                    (concat "^"
+                            (apply (function regexp-or)
+                                   mime-edit-yank-ignored-field-list)
+                            ":") nil t)
                    (setq beg (match-beginning 0))
                    (setq end (1+ (std11-field-end))))
          (delete-region beg end))))))
index a71e2f5..b145f5a 100644 (file)
@@ -49,6 +49,8 @@
 ;;; @ button
 ;;;
 
+;; #### This definition should be removed.  Instead, defface should be
+;; used.
 (defcustom mime-button-face 'bold
   "Face used for content-button or URL-button of MIME-Preview buffer.
 Variable `widget-button-face' is equivalent for it if widget is used."