Synch up with main trunk, and prepare the release 2.12.0.

diff --git a/ChangeLog b/ChangeLog
index 538ddee..1f3cf38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-24  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * 2.12.0 - "Your Wildest Dreams"
+
 2004-12-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * WL-MK (wl-texinfo-format-file): Revert.

diff --git a/doc/wl.texi b/doc/wl.texi
index a6aacef..e0ccad5 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -2637,7 +2637,7 @@ message has empty subject field.
 @subsection Temporary Marks
 @cindex Mark, Temporary
 
-There are four temporary marks,
+There are seven temporary marks,
 @samp{*}, @samp{d}, @samp{D}, @samp{o}, @samp{O}, @samp{i} and @samp{~}.
 Temporary marks indicates message operations.
 
@@ -2678,8 +2678,8 @@ Your answer is printed in the summary line.
 
 @subsection Persistent Marks
 
-There are five persistent marks, @samp{!}, @samp{N}, @samp{n}, @samp{U},
-@samp{u}, @samp{A}, @samp{a} and @samp{$}.
+There are ten persistent marks, @samp{!}, @samp{N}, @samp{n}, @samp{U},
+@samp{u}, @samp{A}, @samp{a}, @samp{F}, @samp{f} and @samp{$}.
 
 The persistent mark indicates the message's status and it is saved.
 Each persistent mark indicates:
@@ -3027,8 +3027,8 @@ are displayed in the following list.
 @example
 @group
 %n  message number
-%T  temporary mark (mandatory)
-%P  persistent mark (mandatory)
+%T  temporary mark
+%P  persistent mark
 %Y  year
 %M  month
 %D  day
@@ -5491,24 +5491,13 @@ are also reflected in the servers when Wanderlust becomes on-line.
 
 
 @node Pre-fetching Reservations,  , Marking, Enable Operations
-@subsection Pre-fetching (IMAP4, NNTP)
+@subsection Pre-fetching
 
 You can make reservations for pre-fetching messages in networking
 folders (IMAP, NNTP, POP3, shimbun).  Reserved messages are marked with
 @samp{u} but not cached yet.  When Wanderlust becomes on-line, they are
 pre-fetched from servers.
 
-If the variable @code{elmo-enable-disconnected-operation} is @code{nil},
-these off-line operations for IMAP4 and NNTP do not take place, and
-off-line re-file, copy or suchlike simply results in error.
-
-Because off-line operations use cache files, it is a bad idea to erase
-them by hand; it may cause Wanderlust to malfunction.
-
-If you want to remove caches, be sure to execute @kbd{M-x
-elmo-cache-expire-by-size}.  @code{elmo-cache-expire-by-size} does not
-remove caches for messages relevant to off-line operations.
-
 
 @node Plugged Mode, Off-line State settings, Enable Operations, Disconnected Operations
 @section Switching On-line/Off-line per Server/Port
@@ -8757,7 +8746,8 @@ But you will have following limitations.
 @item
 You cannot use forwarded mark (@samp{F}, @samp{f}).
 @item
-You may only use @samp{important} flag. The other flags may not be available.
+You may only use @samp{important} flag. The other global flags may not
+be available.
 @end enumerate
 
 @subsection Changes from @samp{'mark} folder to  @samp{'flag}.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 35610a1..b9964d9 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-24  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * 2.12.0 is released.
+
 2004-12-22  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-maildir.el (elmo-folder-append-buffer): Use elmo-copy-file

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 835a584..3d819c5 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,17 @@
+2004-12-24  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * 2.12.0 is released.
+
+2004-12-24  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-fldmgr.el (wl-fldmgr-set-petname): Check wl-folder-group-alist
+       only if the target is group.
+       * wl-folder.el (wl-folder-append-petname): Don't check group name.
+
+2004-12-23  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-folder.el (wl-folder-buffer-search-entity): Check real name.
+
 2004-12-22  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-vars.el (wl-smtp-authenticate-realm): New user option.

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 058c3e0..b84d9ed 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -1268,7 +1268,8 @@ return value is diffs '(-new -unread -all)."
          (if (string= petname old-petname)
              nil
            (if (or (rassoc petname wl-folder-petname-alist)
-                   (wl-string-assoc petname wl-folder-group-alist))
+                   (and is-group
+                        (wl-string-assoc petname wl-folder-group-alist)))
                (message "%s: already exists" petname)
              (wl-folder-append-petname name petname)
              (setq change t)))))

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index d55bf97..4e53bb8 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -248,11 +248,17 @@
 
 (defun wl-folder-buffer-search-entity (folder &optional searchname)
   (let ((search (or searchname (wl-folder-get-petname folder)))
-       case-fold-search)
-    (re-search-forward
-     (concat
-      "^[ \t]*"
-      (regexp-quote search) ":[-0-9\\*-]+/[0-9\\*-]+/[0-9\\*-]+") nil t)))
+       case-fold-search
+       result)
+    (catch 'found
+      (while (setq result
+                  (re-search-forward
+                   (concat
+                    "^[ \t]*"
+                    (regexp-quote search) ":[-0-9\\*-]+/[0-9\\*-]+/[0-9\\*-]+")
+                   nil t))
+       (when (string= (wl-folder-get-entity-from-buffer) folder)
+         (throw 'found result))))))
 
 (defsubst wl-folder-get-folder-name-by-id (entity-id &optional hashtb)
   (and (numberp entity-id)
@@ -1507,15 +1513,12 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'."
   (run-hooks 'wl-folder-mode-hook))
 
 (defun wl-folder-append-petname (realname petname)
-  (let (pentry)
-    ;; check group name.
-    (if (wl-folder-search-group-entity-by-name petname wl-folder-entity)
-       (error "%s already defined as group name" petname))
-    (when (setq pentry (wl-string-assoc realname wl-folder-petname-alist))
+  (let ((pentry (wl-string-assoc realname wl-folder-petname-alist)))
+    (when pentry
       (setq wl-folder-petname-alist
-           (delete pentry wl-folder-petname-alist)))
-    (wl-append wl-folder-petname-alist
-              (list (cons realname petname)))))
+           (delete pentry wl-folder-petname-alist))))
+  (wl-append wl-folder-petname-alist
+            (list (cons realname petname))))
 
 (defun wl-folder ()
   (let (initialize folder-buf)

diff --git a/wl/wl-version.el b/wl/wl-version.el
index 9fb7bcf..89f9204 100644 (file)
--- 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-pre2"))
+   "Your Wildest Dreams"))
 
 (defconst wl-version-status nil
   "Wanderlust verstion status.  For override default rule.