Synch up with main trunk.

diff --git a/ChangeLog b/ChangeLog
index 9328a58..99e0226 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-02  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * doc/wl-refcard.tex: Fix
+       * doc/wl-refcard-ja.tex: New file
+
+2002-09-30  Koichiro Ohba  <koichiro@ca.mbn.or.jp>
+
+       * etc/icons/wl-folder-goto-draft-folder-up.xpm: Add missing comma.
+
 2002-07-12  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * WL-ELS (ELMO-MODULES): Added elmo-split.

diff --git a/NEWS b/NEWS
index a36e5a1..a493666 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 ** Buffer prefetch works fine now. Messages of the number specified by
    wl-message-buffer-prefetch-depth are loaded into buffer in advance.
 
+** elmo-dop-queue-flush flushes queue that concerns plugged folder.
+
 ** Starting Wanderlust on the new frame is possible now. Set as
    (autoload 'wl-other-frame "wl" "Wanderlust on new frame." t)
 

diff --git a/NEWS.ja b/NEWS.ja
index d13479a..37e58e2 100644 (file)
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -10,6 +10,8 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
 ** \e$B%P%C%U%!%W%j%U%'%C%A$,<BAu$5$l$^$7$?!#\e(Bwl-message-buffer-prefetch-depth
    \e$B$N?t$@$1!"%a%C%;!<%8$r%P%C%U%!$K@hFI$_$7$^$9!#\e(B
 
+** elmo-dop-queue-flush \e$B$O7R$,$C$F$$$k%]!<%H$K4X$9$k%-%e!<$r\e(B flush \e$B$7$^$9!#\e(B
+
 ** \e$B?7$7$$%U%l!<%`$r3+$$$F\e(B Wanderlust \e$B$r5/F0$G$-$k$h$&$K$J$j$^$7$?!#\e(B
    (autoload 'wl-other-frame "wl" "Wanderlust on new frame." t)
    \e$B$N$h$&$K@_Dj$7$F2<$5$$!#\e(B

diff --git a/doc/wl-refcard.tex b/doc/wl-refcard.tex
index ff8ef11..7ce7416 100644 (file)
--- a/doc/wl-refcard.tex
+++ b/doc/wl-refcard.tex
@@ -285,8 +285,8 @@ are preserved on all copies.
 
 \section{folder management}
 
-\key{Cut region}{C-k}
-\key{Cut current entity}{C-w}
+\key{Cut current entity}{C-k}
+\key{Cut region}{C-w}
 \key{Yank}{C-y}
 \key{Add folder}{m a}
 \key{Add group}{m g}
@@ -333,7 +333,7 @@ are preserved on all copies.
 \key{Mark as target}{*}
 \key{Mark all messages as target}{m a}
 \key{Mark current thread as target}{m t}
-\key{Pick messages and mark}{*}
+\key{Pick messages and mark}{?}
 \key{Pick messages from marked ones}{m *}
 \key{Mark target messages for refiling}{m o}
 \key{Mark target messages for deleting}{m d}
@@ -367,7 +367,7 @@ are preserved on all copies.
 \key{Go back to summary buffer}{q}
 \key{Scroll up or move to next content}{SPC}
 \key{Scroll down or move to previous content}{DEL}
-\key{Move to upper content}{u}
+\key{Move to next content}{n}
 \key{Move to previous content}{p}
 \key{Decode current content as `play mode'}{v}
 \key{Decode current content as `extract mode'}{e}

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index c175eff..cb0ddf0 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-06  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo-dop.el (elmo-dop-queue-flush): Check obsolete at first.
+
 2002-10-01  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * elmo-filter.el (elmo-folder-list-unreads): Call generic method
@@ -28,6 +32,11 @@
        * elmo-msgdb.el (elmo-msgdb-set-status): Fixed logic (new to read).
        (elmo-msgdb-uncached-marks): Added elmo-msgdb-new-mark.
 
+2002-09-24  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * elmo.el: Add autoload setting for elmo-nntp-post, fix against
+       the problem reported by Sean Rima [wl-en:180].
+
 2002-09-19  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-filter.el (elmo-folder-diff): Treat 'mark:' filter.

diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index e3a6d95..a390d88 100644 (file)
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -88,20 +88,21 @@ Automatically loaded/saved.")
 
 (defun elmo-dop-queue-flush ()
   "Flush disconnected operations that consern plugged folders."
+  ;; obsolete
+  (unless (or (null elmo-dop-queue)
+             (vectorp (car elmo-dop-queue)))
+    (if (y-or-n-p "
+Saved queue is old version(2.6). Clear all pending operations? ")
+       (progn
+         (setq elmo-dop-queue nil)
+         (message "All pending operations are cleared.")
+         (elmo-dop-queue-save))
+      (error "Please use 2.6 or earlier.")))
   (elmo-dop-queue-merge)
   (let ((queue-all elmo-dop-queue)
        queue
        (count 0)
        len)
-    ;; obsolete
-    (unless (or (null queue-all)
-               (vectorp (car queue-all)))
-      (if (y-or-n-p "Saved queue is old version(2.6). Clear all pending operations? ")
-         (progn
-           (setq elmo-dop-queue nil)
-           (message "All pending operations are cleared.")
-           (elmo-dop-queue-save))
-       (error "Please use 2.6 or earlier.")))
     (while queue-all
       (if (elmo-folder-plugged-p
           (elmo-make-folder (elmo-dop-queue-fname (car queue-all))))

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 5f92ec8..792a581 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1603,6 +1603,7 @@ Return a hashtable for newsgroups."
 
 ;; autoloads
 (autoload 'elmo-dop-queue-flush "elmo-dop")
+(autoload 'elmo-nntp-post "elmo-nntp")
 
 (require 'product)
 (product-provide (provide 'elmo) (require 'elmo-version))

diff --git a/etc/VERSION b/etc/VERSION
index adeb5c4..ec00d1f 100644 (file)
--- a/etc/VERSION
+++ b/etc/VERSION
@@ -122,3 +122,4 @@
 2.8.1   Something
 
 2.9.x   Unchained Melody
+2.9.15  Undercover Of The Night
\ No newline at end of file

diff --git a/etc/icons/wl-folder-goto-draft-folder-up.xpm b/etc/icons/wl-folder-goto-draft-folder-up.xpm
index 87bfbd4..b1d343a 100644 (file)
--- a/etc/icons/wl-folder-goto-draft-folder-up.xpm
+++ b/etc/icons/wl-folder-goto-draft-folder-up.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char * wl_folder_goto_draft_folder_up_xpm[] = {
 "32 32 7 1",
-"       c #BEFBBEFBBEFB s backgroundToolBarColor"
+"       c #BEFBBEFBBEFB s backgroundToolBarColor",
 ".     c #69A68E38EFBE",
 "X     c #000000000000",
 "o     c #EFBEFFFFC71B",

diff --git a/wl/ChangeLog b/wl/ChangeLog
index cdd0de9..ec534c1 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-06  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-mime.el (wl-summary-burst): Get elmo folder correctly.
+       Take prefix argument to force asking the destination folder.
+
 2002-09-26  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-summary.el (wl-summary-prefetch-msg): If mark is changed,
@@ -31,6 +36,12 @@
        (wl-summary-resume-cache-status): Rewrite.
        (wl-summary-exec-subr): Remove unused local variable.
 
+2002-09-23  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * wl-summary.el (wl-summary-cursor-move-surface): Add missing
+       logic to call `wl-summary-buffer-prev-folder-function'.
+       (pointed out by Kazuhiro NISHIYAMA [mhc:01644])
+
 2002-09-18  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-draft.el (wl-draft-reply): Avoid error when buf and summary-buf

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 18c3034..7f09b26 100644 (file)
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -189,17 +189,18 @@ By setting following-method as yank-content."
              (mime-entity-fetch-field entity "Message-ID")))))
     number))
 
-(defun wl-summary-burst ()
-  ""
-  (interactive)
+(defun wl-summary-burst (&optional arg)
+  "De-capsulate embedded messages in MIME format.
+With ARG, ask destination folder."
+  (interactive "P")
   (let ((raw-buf (wl-summary-get-original-buffer))
        (view-buf wl-message-buffer)
        children message-entity content-type target)
     (save-excursion
       (setq target wl-summary-buffer-elmo-folder)
-      (while (not (elmo-folder-writable-p target))
-       (setq target
-             (wl-summary-read-folder wl-default-folder "to extract to")))
+      (when (or arg (not (elmo-folder-writable-p target)))
+       (let ((fld (wl-summary-read-folder wl-default-folder "to extract to")))
+         (setq target (wl-folder-get-elmo-folder fld))))
       (wl-summary-set-message-buffer-or-redisplay)
       (with-current-buffer view-buf
        (setq message-entity (get-text-property (point-min) 'mime-view-entity)))

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 900a169..42d6aa4 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -4270,7 +4270,7 @@ If ARG, exit virtual folder."
                (wl-summary-delete-all-temp-marks)
                (encode-coding-region
                 (point-min) (point-max)
-                (or (and wl-on-mule ; one in mcs-ltn1 cannot take 2 arg.
+                (or (and wl-on-mule ; one in mcs-ltn1(apel<10.4) cannot take 2 arg.
                          (mime-charset-to-coding-system charset 'LF))
                     ;; Mule 2 doesn't have `*ctext*unix'.
                     (mime-charset-to-coding-system charset)))
@@ -4912,8 +4912,12 @@ Use function list is `wl-summary-write-current-folder-functions'."
        (if wl-summary-buffer-disp-msg
            (wl-summary-redisplay))
       (if interactive
-         (if wl-summary-buffer-next-folder-function
-             (funcall wl-summary-buffer-next-folder-function)
+         (cond
+          ((and (not downward) wl-summary-buffer-prev-folder-function)
+           (funcall wl-summary-buffer-prev-folder-function))
+          ((and downward wl-summary-buffer-next-folder-function)
+           (funcall wl-summary-buffer-next-folder-function))
+          (t
            (when wl-auto-select-next
              (setq next-entity
                    (if downward
@@ -4925,7 +4929,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
             '(lambda () (wl-summary-next-folder-or-exit next-entity))
             (format
              "No more messages. Type SPC to go to %s."
-             (wl-summary-entity-info-msg next-entity finfo))))))))
+             (wl-summary-entity-info-msg next-entity finfo)))))))))
 
 (defun wl-summary-prev (&optional interactive)
   (interactive)