* wl-demo.el (wl-demo-icon-name): Use X'mas logo on Dec 25 too.

* elmo-nmz.el (elmo-map-folder-list-message-locations): Allow
"file://..." index.

* NEWS, NEWS.ja: Changed order.

diff --git a/ChangeLog b/ChangeLog
index 1a3d003..813478a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * NEWS, NEWS.ja: Changed order.
+
 2001-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * WL-MK (install-wl-icons): Install *.img files for Emacs 21.

diff --git a/NEWS b/NEWS
index 43f3cdd..f561a93 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,11 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 ** Wanderlust might not work with FLIM 1.14.2 and older.
    It is recommended to use FLIM 1.14.3 or newer and associated SEMI.
 
+** If you set obsolete variables (e.g. renamed ones), Wanderlust shows warning
+   messages and urge you to change settings.
+   To suppress warning messages, set elmo-obsolete-variable-show-warnings to
+   nil.
+
 ** Added new type of folders: shimbun folder
 
    Format: '@' 'virtual server name' '.' 'group name'
@@ -46,11 +51,6 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
    But if you don't want to leave useless data on the disk, delete under
    .elmo/multi and .elmo/archive in advance.
 
-** If you set obsolete variables (e.g. renamed ones), Wanderlust shows warning
-   messages and urge you to change settings.
-   To suppress warning messages, set elmo-obsolete-variable-show-warnings to
-   nil.
-
 ** Variables named xxx-dir are renamed to xxx-directory.
    e.g. wl-icon-dir is renamed to wl-icon-directory.
    Take attention if you set for display of startup logo, etc.

diff --git a/NEWS.ja b/NEWS.ja
index 5af2012..309738d 100644 (file)
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -7,6 +7,11 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
 ** FLIM 1.14.2 \e$B0JA0$N\e(B FLIM \e$B$G$O$&$^$/F0$+$J$$>l9g$,$"$j$^$9!#\e(B
    FLIM 1.14.3 \e$B0J9_$*$h$SBP1~$7$?\e(B SEMI \e$B$r%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 
+** \e$BL>A0JQ99Ey$G4{$K;H$o$l$J$/$J$C$?JQ?t$,@_Dj$5$l$F$$$k$H\e(B warning
+   \e$B$,I=<($5$l$k$h$&$K$J$j$^$7$?!#\e(B
+   warning \e$B$NI=<($rM^@)$9$k$K$O!"JQ?t\e(B elmo-obsolete-variable-show-warnings \e$B$r\e(B
+   nil \e$B$K$7$F$/$@$5$$!#\e(B
+
 ** \e$B?75,%U%)%k%@\e(B shimbun \e$B%U%)%k%@$,DI2C$5$l$^$7$?!#\e(B
 
    \e$B=q<0\e(B: '@' '\e$B2>A[%5!<%PL>\e(B' '.' '\e$B%0%k!<%WL>\e(B'
@@ -47,11 +52,6 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
    \e$B$=$N$^$^$G$bLdBj$"$j$^$;$s$,!"%G%#%9%/$KL5BL$J%G!<%?$r;D$7$?$/$J$$J}$O\e(B
    .elmo/multi, .elmo/archive \e$B0J2<$r$"$i$+$8$a:o=|$7$F$*$$$F$/$@$5$$!#\e(B
 
-** \e$BL>A0JQ99Ey$G4{$K;H$o$l$J$/$J$C$?JQ?t$,@_Dj$5$l$F$$$k$H\e(B warning
-   \e$B$,$G$k$h$&$K$J$j$^$7$?!#\e(B
-   warning \e$B$NI=<($rM^@)$9$k$K$O!"JQ?t\e(B elmo-obsolete-variable-show-warnings \e$B$r\e(B
-   nil \e$B$K$7$F$/$@$5$$!#\e(B
-
 ** xxx-dir \e$B$H$$$&L>A0$NJQ?t$O\e(B xxx-directory \e$B$H$$$&L>A0$KJQ99$5$l$^$7$?!#\e(B
    \e$BNc$($P!"\e(Bwl-icon-dir \e$B$O\e(B wl-icon-directory \e$B$KJQ99$5$l$F$$$^$9!#\e(B
    Emacs21 \e$B$G\e(B logo \e$BI=<($J$I$N@_Dj$7$F$$$kJ}$OFC$KCm0U$7$F$/$@$5$$!#\e(B

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 1af19b4..5889ce4 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,8 @@
 2001-12-12  Yuuichi Teranishi  <teranisi@gohome.org>
 
+       * elmo-nmz.el (elmo-map-folder-list-message-locations): Allow
+       "file://..." index.
+
        * elmo-pop3.el (elmo-pop3-read-response): Set timeout argument
        of accept-process-output as 1.
        (elmo-pop3-read-contents): Ditto.

diff --git a/elmo/elmo-nmz.el b/elmo/elmo-nmz.el
index e690a8e..5392a62 100644 (file)
--- a/elmo/elmo-nmz.el
+++ b/elmo/elmo-nmz.el
@@ -233,7 +233,7 @@ If the value is a list, all elements are used as index paths for namazu."
       (goto-char (point-min))
       (while (not (eobp))
        (beginning-of-line)
-       (setq bol (point))
+       (setq bol (if (looking-at "^file://") (match-end 0)(point)))
        (end-of-line)
        (setq locations (cons (buffer-substring bol (point)) locations))
        (forward-line 1))

diff --git a/wl/ChangeLog b/wl/ChangeLog
index a9e8f41..b9e2041 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-demo.el (wl-demo-icon-name): Use X'mas logo on Dec 25 too.
+
 2001-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * wl-demo.el (wl-demo-image-type-alist): Add bitmap, prefer xbm

diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index e66c190..72bdb9f 100644 (file)
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -41,7 +41,7 @@
 
 (defconst wl-demo-icon-name
   (concat "wl-" (wl-version-status)
-         (if (string-match "^... Dec \\([ 1][0-9]\\|2[0-4]\\)"
+         (if (string-match "^... Dec \\([ 1][0-9]\\|2[0-5]\\)"
                            (current-time-string))
              "-xmas-logo"
            "-logo"))