Mercurial > emacs
changeset 85470:13362e3adf7c
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: emacs@sv.gnu.org/emacs--devo--0--patch-900
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 20 Oct 2007 02:21:09 +0000 |
| parents | 7a37dbd2963b (current diff) 7bb8a742f977 (diff) |
| children | 7f51313e99f5 4b09bb044f38 12589730c028 |
| files | lisp/ChangeLog lisp/bs.el lisp/gnus/ChangeLog |
| diffstat | 5 files changed, 42 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/nt/README.W32 Sat Oct 20 02:04:43 2007 +0000 +++ b/admin/nt/README.W32 Sat Oct 20 02:21:09 2007 +0000 @@ -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
--- a/lisp/ChangeLog Sat Oct 20 02:04:43 2007 +0000 +++ b/lisp/ChangeLog Sat Oct 20 02:21:09 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-19 Juanma Barranquero <lekktu@gmail.com> + + * 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 <monnier@iro.umontreal.ca> * diff-mode.el (diff-auto-refine): New var.
--- a/lisp/bs.el Sat Oct 20 02:04:43 2007 +0000 +++ b/lisp/bs.el Sat Oct 20 02:21:09 2007 +0000 @@ -612,7 +612,6 @@ (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 @@ (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>
--- a/lisp/gnus/ChangeLog Sat Oct 20 02:04:43 2007 +0000 +++ b/lisp/gnus/ChangeLog Sat Oct 20 02:21:09 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-18 Katsumi Yamaoka <yamaoka@jpl.org> + + * 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 <yamaoka@jpl.org> * gnus-util.el (gnus-string<): New function.
--- a/lisp/gnus/nnmail.el Sat Oct 20 02:04:43 2007 +0000 +++ b/lisp/gnus/nnmail.el Sat Oct 20 02:21:09 2007 +0000 @@ -1900,8 +1900,10 @@ ;; 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)