From f99d5c257662f7fe9827446b5d693f8cfa39e69f Mon Sep 17 00:00:00 2001 From: teranisi Date: Wed, 15 Dec 2004 14:55:23 +0000 Subject: [PATCH] Synch up to main trunk. --- doc/wl-ja.texi | 58 +++++++++++++++++++++++++++++------ doc/wl.texi | 88 +++++++++++++++++++++++++++++++++++++++++++++--------- wl/ChangeLog | 9 ++++++ wl/wl-e21.el | 3 +- wl/wl-util.el | 6 ++-- wl/wl-version.el | 2 +- 6 files changed, 139 insertions(+), 27 deletions(-) diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 155d23a..131147f 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -3139,9 +3139,10 @@ dispose (@samp{d}), delete (@samp{D}), prefetch (@samp{i}), resend (@samp{~}) @item . @kindex . (Summary) @findex wl-summary-redisplay -$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$r:FI=<($7$^$9!#(B -prefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!#(B -(@code{wl-summary-redisplay}) +$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$r%G%U%)%k%H$NI=<(7A<0$G:FI=<($7$^$9!#(B +prefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7(B +$B$^$9!#(B@kbd{C-u C-u .} $B$N$h$&$K(B 2$B2s$N(B @kbd{C-u} $B$rIU$1$Fl9g!"8=:_(B +$B$NI=<(7A<0$r0];}$7$F:FFI$_9~$_$7D>$7$^$9!#(B(@code{wl-summary-redisplay}) @item < @kindex < (Summary) @@ -3329,15 +3330,32 @@ prefix argument $B$D$-$J$i$P!"%+!<%=%k9T$N;R%9%l%C%I$rA4$F3+$-$^$9!#(B @item H @kindex H (Summary) -@findex wl-summary-redisplay-all-header -$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$r!"$9$Y$F$N%X%C%@>pJs$H$H$b$KI=<($7$^$9!#(B -(@code{wl-summary-redisplay-all-header}) +@findex wl-summary-toggle-all-header +$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$r!"A4$F%X%C%@>pJs$rI=<($9$k$+$I$&$+$r@Z(B +$B$j49$($F:FI=<($7$^$9!#(Bprefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$b(B +$BL5;k$7$F:FFI$_9~$_$7D>$7$^$9!#(B@kbd{C-u C-u H} $B$N$h$&$K(B 2$B2s$N(B @kbd{C-u} $B$r(B +$BIU$1$Fl9g!"8=:_$N%X%C%@$NI=<(7A<0$r%5%^%j$N%G%U%)%k%HCM$H$7$F(B +$B@_Dj$7$^$9!#(B +(@code{wl-summary-toggle-all-header}) @item M @kindex M (Summary) -@findex wl-summary-redisplay-no-mime -$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$r!"(BMIME $B2r@O$9$k$3$H$J$/I=<($7$^$9!#(B -(@code{wl-summary-redisplay-no-mime}) +@findex wl-summary-toggle-mime +$B8=:_%+!<%=%k$,$"$k9T$N%a%C%;!<%8$r!"(BMIME $B2r@O$N;XDj$r@Z$j49$($F:FI=<($7$^(B +$B$9!#@Z$j49$($O!"(B@code{wl-summary-display-mime-mode-list} $B$K;XDj$5$l$?=g$K(B +$B9T$o$l$^$9!#$^$?!"?tCM$N(B prefix argument $B$D$-$Gl9g!"0J2<$N$h$&$K(B +$BD>@\@Z$j49$($k$3$H$,=PMh$^$9!#(B + +@example +@group +1: MIME $B2r@O$rM-8z$K$7$^$9(B +2: $B%X%C%@$N$_(B MIME $B2r@O$rM-8z$K$7$^$9(B +3: MIME $B2r@O$rL58z$K$7$^$9(B +@end group +@end example + +@kbd{C-u C-u M} $B$N$h$&$K(B 2$B2s$N(B @kbd{C-u} $B$rIU$1$Fl9g!"8=:_$N;XDj(B +$B$r%5%^%j$N%G%U%)%k%HCM$H$7$F@_Dj$7$^$9!#(B(@code{wl-summary-toggle-mime}) @item C-c C-f @kindex C-c C-f (Summary) @@ -3454,6 +3472,8 @@ update-entirely $BJ];}$7$F$$$k(B msgdb $B$N>pJs$H:G?7>pJs$N:9J,$r99?7$7$^$9! rescan $B8=:_$N(B msgdb $B$K4p$E$$$F:FI=<($r9T$$$^$9!#(B rescan-noscore $B8=:_$N(B msgdb $B$K4p$E$$$F:FI=<($r9T$$$^$9!#(B $B%9%3%"$K$h$j>C$($?%a%C%;!<%8$bI=<($7$^$9!#(B +rescan-thread $B8=:_$N(B msgdb $B$K4p$E$$$F:FI=<($r9T$$$^$9!#(B + $B%9%l%C%I$N>pJs$b:F9=C[$7$^$9!#(B cache-status $B%-%c%C%7%e$N>uBV$r%^!<%/$KH?1G$7$^$9!#(B mark $B%^!<%/$N>uBV$r:G?7$K$7$^$9!#(B no-sync $B2?$b$7$^$;$s!#(B @@ -4299,6 +4319,26 @@ Non-nil $B$J$i(B @code{wl-summary-jump-to-msg-by-message-id} $B$G!"%a%C%;!<%8 (private "blue" "X"))) @end group @end lisp + +@item wl-summary-display-mime-mode-list +@vindex wl-summary-display-mime-mode-list +$B=i4|@_Dj$O0J2<$N%j%9%H!#(B + +@lisp +@group +(mime as-is) +@end group +@end lisp + +@noindent +@code{wl-summary-toggle-mime} $B$O$3$N%j%9%H$N=g$K(B MIME $B2r@O$N;XDj$r@Z$j49(B +$B$($^$9!#(BMIME $B2r@O$NJ}<0$K$O0J2<$N$b$N$,;XDj$G$-$^$9!#(B + +@example +@code{mime} : MIME $B2r@O$r9T$$$^$9(B +@code{header-only} : $B%X%C%@$N$_(B MIME $B2r@O$r9T$$$^$9(B +@code{as-is} : MIME $B2r@O$r9T$$$^$;$s(B +@end example @end table diff --git a/doc/wl.texi b/doc/wl.texi index c7d38ca..d0cc8c4 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -3143,11 +3143,12 @@ Proceed reading a message at the current cursor point. @item . @kindex . (Summary) @findex wl-summary-redisplay -Redisplay a message at the current cursor point. -If this command is called with prefix argument, -Redisplay message regardless of the message cache (message is re-loaded -from source). -(@code{wl-summary-redisplay}) +Redisplay a message at the current cursor point with default display +type. If this command is called with prefix argument, reload and redisplay +message regardless of the message cache. +If this command is called with twice multiples @kbd{C-u} as @kbd{C-u C-u .}, +reload and redisplay message with current display type regardless of the +message cache. (@code{wl-summary-redisplay}) @item < @kindex < (Summary) @@ -3342,15 +3343,39 @@ list folder (refile destination), guess @samp{To:} field and completed @item H @kindex H (Summary) -@findex wl-summary-redisplay-all-header -Redisplay the message at current cursor point with all header fields. -(@code{wl-summary-redisplay-all-header}) +@findex wl-summary-toggle-all-header +Toggle display type between all and partial header fields and redisplay +the message at current cursor point. If this command is called with +prefix argument, reload and redisplay message regardless of the message cache. +If this command is called with twice multiples @kbd{C-u} as @kbd{C-u C-u H}, +set default display type of summary by current display type of header fields. +(@code{wl-summary-toggle-all-header}) @item M @kindex M (Summary) -@findex wl-summary-redisplay-no-mime -Redisplay the message at current cursor point without MIME analysis. -(@code{wl-summary-redisplay-no-mime}) +@findex wl-summary-toggle-mime +Toggle display type for MIME analysis and redisplay the message at +current cursor point. A change is performed in the order set as +@code{wl-summary-display-mime-mode-list}. If this command is called +with numeric prefix argument, it switch directly as follows. + +@example +@group +1: Enable MIME analysis. +2: Enable MIME analysis only for header fields. +3: Disable MIME analysis. +@end group +@end example + +If this command is called with twice multiples @kbd{C-u} as @kbd{C-u C-u +M}, set default display type of summary by current display type of MIME +analysis. (@code{wl-summary-toggle-mime}) + +@item C-c C-f +@kindex C-c C-f (Summary) +@findex wl-summary-toggle-header-narrowing +Toggle header body narrowing of the message at current cursor point. +(@code{wl-summary-toggle-header-narrowing}) @item B @kindex B (Summary) @@ -3462,6 +3487,8 @@ update-entirely Update the difference between informations in present rescan Redisplay summary by rescanning present msgdb. rescan-noscore Redisplay summary by rescanning present msgdb. Display messages killed by score, too. +rescan-thread Redisplay summary by rescanning present msgdb. + Reconstruct thread, too. cache-status Sync the all marks with the real status of cache. mark Update marks. no-sync Do nothing. @@ -4296,9 +4323,42 @@ The initial setting is as follows: @end group @end lisp -Specify the color of message in summary buffer with flag. If multiple -global flags are on one message, the former flag in this list is -preferred. +Specify the color and the mark of message in summary buffer with flag. +If the mark are omitted, the mark specified in the variable +@code{wl-summary-flag-mark} is assumed. If multiple global flags are on +one message, the former flag in this list is preferred. + +Example: + +@lisp +@group +(setq wl-summary-flag-alist + '((important "purple") + (todo "red") + (business "green" "B") + (private "blue" "X"))) +@end group +@end lisp + +@item wl-summary-display-mime-mode-list +@vindex wl-summary-display-mime-mode-list +The initial setting is the list shown below: + +@lisp +@group +(mime as-is) +@end group +@end lisp + +@noindent +The function @code{wl-summary-toggle-mime} switch specification of MIME +analysis in the order of this list. You can specify one of the follows. + +@example +@code{mime} : Header and body are decoded. +@code{header-only} : Only header is decoded. +@code{as-is} : Header and body are not decoded. +@end example @end table diff --git a/wl/ChangeLog b/wl/ChangeLog index 8f36aae..cdf7448 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,12 @@ +2004-12-15 Yuuichi Teranishi + + * wl-e21.el (wl-draft-mode-setup): Avoid global-font-lock-mode + (Thanks to Yoichi NAKAYAMA). + +2004-12-15 Yoichi NAKAYAMA + + * wl-util.el (wl-save-drafts): Restore echo area. + 2004-12-12 Yuuichi Teranishi * Version number is increased to 2.12.0. diff --git a/wl/wl-e21.el b/wl/wl-e21.el index 3986338..152f059 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -632,7 +632,8 @@ See info under Wanderlust for full documentation. Special commands: -\\{wl-draft-mode-map}")) +\\{wl-draft-mode-map}" + (setq font-lock-defaults nil))) (defun wl-draft-key-setup () (define-key wl-draft-mode-map "\C-c\C-y" 'wl-draft-yank-original) diff --git a/wl/wl-util.el b/wl/wl-util.el index 726042c..a1820d4 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -579,12 +579,14 @@ that `read' can handle, whenever this is possible." result)) (defun wl-save-drafts () - (let ((buffers (wl-collect-draft))) + (let ((msg (current-message)) + (buffers (wl-collect-draft))) (save-excursion (while buffers (set-buffer (car buffers)) (if (buffer-modified-p) (wl-draft-save)) - (setq buffers (cdr buffers)))))) + (setq buffers (cdr buffers)))) + (message msg))) (static-if (fboundp 'read-directory-name) (defun wl-read-directory-name (prompt dir) diff --git a/wl/wl-version.el b/wl/wl-version.el index 93662ba..9fb7bcf 100644 --- a/wl/wl-version.el +++ b/wl/wl-version.el @@ -46,7 +46,7 @@ "Wanderlust" nil (eval-when-compile (product-version (product-find 'elmo-version))) ; equals to ELMO version. - "Your Wildest Dreams-pre")) + "Your Wildest Dreams-pre2")) (defconst wl-version-status nil "Wanderlust verstion status. For override default rule. -- 1.7.10.4