Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 129-130)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 259-260)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: [email protected]/emacs--devo--0--patch-900

5 files changed, 42 insertions, 3 deletions

diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index 4b2cc4edc9..4c74f12f96 100644
--- a/admin/nt/README.W32
+++ b/admin/nt/README.W32
@@ -64,6 +64,32 @@
   (non-windowed) mode of operation is most useful if you have a telnet
   server on your machine, allowing you to run Emacs remotely.
 
+* Image support
+
+  Emacs has built in support for XBM and PPM/PGM/PBM images, and the
+  libXpm library is bundled, providing XPM support (required for color
+  toolbar icons and splash screen).
+
+  Emacs can also support some other image formats with appropriate
+  libraries. These libraries are all available as part of GTK, or from
+  gnuwin32.sourceforge.net. Emacs will find them if the directory they
+  are installed in is on the PATH.
+
+      PNG: requires the PNG reference library 1.2 or later, which will
+      be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
+      or libpng.dll. LibPNG requires zlib, which should come from the same
+      source as you got libpng.
+
+      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
+
+      TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
+      or libtiff.dll.
+
+      GIF: requires libungif or giflib 4.1 or later, which will be
+      called giflib4.dll, libungif4.dll or libungif.dll.
+
+
 * Uninstalling Emacs
 
   If you should need to uninstall Emacs, simply delete all the files and
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d831ea839e..8ea68f0da0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Juanma Barranquero  <[email protected]>
+
+	* bs.el (bs--track-window-changes): Don't refresh the whole list.
+	(bs-mode): Set mode-class property to special.
+
 2007-10-20  Stefan Monnier  <[email protected]>
 
 	* diff-mode.el (diff-auto-refine): New var.
diff --git a/lisp/bs.el b/lisp/bs.el
index bb2dbae83c..105e5702bc 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -612,7 +612,6 @@ Used from `window-size-change-functions'."
   (let ((win (get-buffer-window "*buffer-selection*" frame)))
     (when win
       (with-selected-window win
-	(bs-refresh)
 	(bs--set-window-height)))))
 
 (defun bs--remove-hooks ()
@@ -622,6 +621,8 @@ Used from `window-size-change-functions'."
   (remove-hook 'kill-buffer-hook 'bs--remove-hooks t)
   (remove-hook 'change-major-mode-hook 'bs--remove-hooks t))
 
+(put 'bs-mode 'mode-class 'special)
+
 (define-derived-mode bs-mode nil "Buffer-Selection-Menu"
   "Major mode for editing a subset of Emacs' buffers.
 \\<bs-mode-map>
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 59a32921dc..5f49f2dc81 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-18  Katsumi Yamaoka  <[email protected]>
+
+	* nnmail.el (nnmail-fancy-expiry-target): Use rmail-dont-reply-to to
+	exclude address matching message-dont-reply-to-names.
+
 2007-10-15  Katsumi Yamaoka  <[email protected]>
 
 	* gnus-util.el (gnus-string<): New function.
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 71a528c0f0..35f5476f9b 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1900,8 +1900,10 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
        ;; To or From header
        ((and (equal header 'to-from)
 	     (or (string-match (cadr regexp-target-pair) from)
-		 (and (string-match message-dont-reply-to-names from)
-		      (string-match (cadr regexp-target-pair) to))))
+		 (and (string-match (cadr regexp-target-pair) to)
+		      (let ((rmail-dont-reply-to-names
+			     message-dont-reply-to-names))
+			(equal (rmail-dont-reply-to from) "")))))
 	(setq target (format-time-string (caddr regexp-target-pair) date)))
        ((and (not (equal header 'to-from))
 	     (string-match (cadr regexp-target-pair)