From: hayashi Date: Wed, 14 Jun 2000 03:27:20 +0000 (+0000) Subject: (mime-edit-mime-version-field-for-message/partial): X-Git-Tag: emy-1_13_7~4 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d2794a40186fe6b71b01893540bb214d6e12f6d7;p=elisp%2Fsemi.git (mime-edit-mime-version-field-for-message/partial): Add an accidentally removed newline. * mime-edit.el (mime-edit-yank-ignored-field-regexp): Removed. (mime-edit-yank-ignored-field-list): Make this customizable. --- diff --git a/ChangeLog b/ChangeLog index 0372f12..aae5995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-06-13 Yoshiki Hayashi + + * 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 + + * mime-edit.el (mime-edit-yank-ignored-field-regexp): Removed. + (mime-edit-yank-ignored-field-list): Make this customizable. + 2000-06-09 Daiki Ueno * mime-edit.el (mime-edit-insert-key): Insert a text tag when diff --git a/VERSION b/VERSION index 9c1fa27..b29cf0e 100644 --- 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 $(BKLN&E4F;(B -;; Ishikawa Line $(B@P@n@~(B -;;------------------------------------------------------------------------- -0.96 Kaga-Ichinomiya $(B2C2l0l$N5\(B ; $(B!JGr;3Hf$(D5/$(B?@ $(B$8$c$$%P%9(B -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-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-A $(B3[=;BpA0(B -1.0.1 Magae $(BGOBX(B -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 -1.2.0 Nishiizumi $(B@>@t(B -1.2.1 Nomachi $(BLnD.(B - -;;------------------------------------------------------------------------- -;; West Japan Railway $(B@>F|K\N95RE4F;(B http://www.westjr.co.jp/ -;; Hokuriku Line $(BKLN&K\@~(B -;;------------------------------------------------------------------------- -1.2.2 Naoetsu $(BD>9>DE(B ; = JR $(B?.1[K\@~(B -1.2.3 Tanihama $(BC+IM(B -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ò-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-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-A $(B1[Cf5\:j(B -1.4.5 Tomari $(BGq(B -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 -1.5.4 Higashi-Namerikawa $(BEl3j@n(B -1.6.0 Namerikawa $(B3j@n(B ; <=> $(BIY;3COJ}E4F;(B -1.7.0 Mizuhashi $(B?e66(B -1.7.1 Higashi-Toyama $(BElIY;3(B -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-A $(B1[CfBgLg(B -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 -1.9.0 Isurugi $(B@PF0(B -1.9.1 Kurikara $(B6fMx2@Me(B -1.10.0 Tsubata $(BDEH((B -1.10.1 Morimoto $(B?9K\(B -1.10.2 Higashi-Kanazawa $(BEl6bBt(B -1.11.0 Kanazawa $(B6bBt(B ; <=> $(BKLN&E4F;(B $(BKLE46bBt(B -1.12.0 Nishi-Kanazawa $(B@>6bBt(B ; <=> $(BKLN&E4F;(B $(B?7@>6bBt(B -1.12.1 [JR] Nonoichi [JR] $(BLn!9;T(B -1.13.0 Matt-Dò-A $(B>>G$(B -1.13.1 Kaga-Kasama $(B2C2l3^4V(B -1.13.2 Mikawa $(BH~@n(B -1.13.3 Komaiko $(B>.Iq;R(B -1.13.4 Terai $(B;{0f(B -1.13.5 Meih-Dò-A $(BL@Jv(B -1.13.6 Komatsu $(B>.>>(B -1.13.7 Awazu $(B0@DE(B -: : : -------- Tsuruga $(BFX2l(B ; = JR $(B>.IM@~(B -------- Shin-Hikida $(B?7I%ED(B -------- -DÒmi-Shiotsu-A $(B6a9>1vDE(B ; = JR $(B8P@>@~(B -------- Yogo $(BM>8b(B -------- Kinomoto $(BLZ%NK\(B -------- Takatsuki $(B9b7n(B -------- Kawake $(B2OLS(B -------- Torahime $(B8WI1(B -------- Nagahama $(BD9IM(B -------- Tamura $(BEDB<(B -------- Sakata $(B:dED(B - (Maibara) ($(BJF86(B) ; = JR $(BEl3$F;K\@~(B - - -[WEMI version names] - -;;------------------------------------------------------------------------- -;; East Japan Railway $(BElF|K\N95RE4F;(B http://www.jreast.co.jp/ -;; T-Dòkaidò-A Line $(BEl3$F;K\@~(B -;;------------------------------------------------------------------------- -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ò-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-A $(BBg0k(B -1.4.5 Ninomiya $(BFs5\(B -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 -1.5.2 Hayakawa $(BAa@n(B -1.5.3 Nebukawa $(B:,I\@n(B -1.5.4 Manazuru $(B??Da(B -1.6.0 Yugawara $(BEr2O86(B -1.7.0 Atami $(BG.3$(B ; = JR $(B0KEl@~(B -;;------------------------------------------------------------------------- -;; Central Japan Railway $(BEl3$N95RE4F;(B -;;------------------------------------------------------------------------- -1.7.1 Kan'nami $(BH!Fn(B -1.8.0 Mishima $(B;0Eg(B ; = $(B0KF&H":,E4F;(B -1.8.1 Numazu $(B>BDE(B ; = JR $(B8fEB>l@~(B -1.8.2 Katahama $(BJRIM(B -1.8.4 Hara $(B86(B -1.8.5 Higashi-Tagonoura $(BElED;R%N1:(B -1.8.6 Yoshiwara $(B5H86(B ; = $(B3YFnE4F;(B -1.9.0 Fuji $(BIY;N(B ; = JR $(B?H1d@~(B -1.9.1 Fujikawa $(BIY;N@n(B -1.10.0 Shin-Kambara $(B?73w86(B -1.10.1 Kambara $(B3w86(B -1.10.2 Yui $(BM3Hf(B -1.11.0 Okitsu $(B6=DE(B -1.12.0 Shimizu $(B@6?e(B -1.12.1 Kusanagi $(BApFe(B -1.13.0 Shizuoka $(B@E2,(B -1.13.1 Abekawa $(B0BG\@n(B -1.13.2 Mochimune $(BMQ=!(B -1.13.3 Yaizu $(B>FDE(B -1.13.4 Nishi-Yaizu $(B@>>FDE(B -1.13.5 Fijieda $(BF#;^(B -1.13.6 Rokug-Dò-A $(BO;9g(B -1.13.7 Shimada $(BEgED(B ------- Kanaya $(B6bC+(B ; = $(BBg0f@nE4F;(B ------- Kikugawa $(B5F@n(B ------- Kakegawa $(B3]@n(B ; = $(BE7N5IML>8PE4F;(B ------- Fukuroi $(BB^0f(B ------- Iwata $(BHXED(B ------- Toyodach-Dò-A $(BK-EDD.(B ------- Tenry-Dþgawa-A $(BE7N5@n(B ------- Hamamatsu $(BIM>>(B ; = $(B1s=#E4F;(B ------- Takatsuka $(B9bDM(B ------- Maisaka $(BIq:e(B ------- Bentenjima $(BJ[E7Eg(B ------- Araimachi $(B?75oD.(B ------- Wasizu $(BOIDE(B ------- Shinjohara $(B?7=j86(B ; = $(BE7N5IML>8PE4F;(B ------- Futagawa $(BFs2O(B ------- Toyohashi $(BK-66(B ; = JR $(BHSED@~(B -: : : ------- Kanayama $(B6b;3(B ; =$(B!J(BJR $(BCf1{K\@~!K(B ------- 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 -: : : ------- Samegai $(B@C%v0f(B -;;------------------------------------------------------------------------- -;; West Japan Railway $(B@>F|K\N95RE4F;(B http://www.westjr.co.jp/ -;;------------------------------------------------------------------------- ------- Maibara $(BJF86(B ; = JR $(BKLN&K\@~(B -: : : ------- Kusatsu $(BApDE(B ; = JR $(BApDE@~(B -: : : ------- Yamashina $(B;32J(B ; = JR $(B8P@>@~(B ------- 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-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-A $(B?@8M(B ; = JR $(B;3M[K\@~(B - - -[REMI version names] - -;;------------------------------------------------------------------------- -;; West Japan Railway $(B@>F|K\N95RE4F;(B http://www.westjr.co.jp/ -;; Himi Line $(BI98+@~(B -;;------------------------------------------------------------------------- -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-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-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 - -;;------------------------------------------------------------------------- -;; Hokuetsu Express $(BKL1[5^9T(B -;; http://www.tiara.or.jp/~tokamaci/hokuhoku/hokuhoku.html -;; Hokuhoku Line $(B$[$/$[$/@~(B -;;------------------------------------------------------------------------- -1.13.0 Saigata $(B:T3c(B ; = JR $(B?.1[K\@~(B -1.13.1 Kubiki $(B$/$S$-(B -1.13.2 -DÒike-Ikoinomori-A $(BBgCS$$$3$$$N?9(B - - -[etc.] - -;;------------------------------------------------------------------------- -;; West Japan Railway $(B@>F|K\N95RE4F;(B http://www.westjr.co.jp/ -;; Kosei Line $(B8P@>@~(B -;;------------------------------------------------------------------------- -------- (-DÒmi-Shiotsu)-A ($(B6a9>1vDE(B) ; = JR $(BKLN&K\@~(B -: : : -------- Nishi--DÒtsu-A $(B@>BgDE(B - (Yamashina) ($(B;32J(B) ; = JR $(BEl3$F;K\@~(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 diff --git a/emy.texi b/emy.texi index 8e41389..a76a8e3 100644 --- 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 diff --git a/mime-edit.el b/mime-edit.el index 0b953ad..ca2fd91 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -107,6 +107,8 @@ ;;; 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 ;; 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 - ;; 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 + ;; 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)))))) diff --git a/semi-def.el b/semi-def.el index a71e2f5..b145f5a 100644 --- a/semi-def.el +++ b/semi-def.el @@ -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."