Mercurial > emacs
changeset 91507:5f89bbfccdc3
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 04 Feb 2008 09:39:04 +0000 |
| parents | ab078721fd90 (current diff) 5bd0d726b8e7 (diff) |
| children | 73c67c7aa435 |
| files | doc/emacs/ChangeLog doc/emacs/maintaining.texi doc/misc/tramp.texi lisp/ChangeLog lisp/gnus/ChangeLog lisp/term/w32-win.el |
| diffstat | 6 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Mon Feb 04 09:38:49 2008 +0000 +++ b/doc/emacs/ChangeLog Mon Feb 04 09:39:04 2008 +0000 @@ -1,3 +1,11 @@ +2008-02-02 Eli Zaretskii <eliz@gnu.org> + + * maintaining.texi (Tags): Fix last change. + +2008-02-02 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi: Use new FSF's Back-Cover Text. + 2008-01-31 Nick Roberts <nickrob@snap.net.nz> * trouble.texi (Checklist): Direct users to emacs-devel@gnu.org.
--- a/doc/emacs/maintaining.texi Mon Feb 04 09:38:49 2008 +0000 +++ b/doc/emacs/maintaining.texi Mon Feb 04 09:39:04 2008 +0000 @@ -130,7 +130,7 @@ @node Tags @section Tags Tables -@cindex tag tables +@cindex tags and tag tables A @dfn{tags table} is a description of how a multi-file program is broken up into files. It lists the names of the component files and the
--- a/lisp/ChangeLog Mon Feb 04 09:38:49 2008 +0000 +++ b/lisp/ChangeLog Mon Feb 04 09:39:04 2008 +0000 @@ -1,3 +1,9 @@ +2008-02-03 Juanma Barranquero <lekktu@gmail.com> + + * term/w32-win.el (image-library-alist): Prefer libpng12 to libpng13, + because the latter is in fact a 1.2.8 build distributed with GTK+ (as + of today, the most recent libpng is 1.2.24). + 2008-02-03 Michael Albinus <michael.albinus@gmx.de> * ediff-util.el (ediff-compute-custom-diffs-maybe): Handle remote
--- a/lisp/gnus/ChangeLog Mon Feb 04 09:38:49 2008 +0000 +++ b/lisp/gnus/ChangeLog Mon Feb 04 09:39:04 2008 +0000 @@ -108,7 +108,7 @@ 2008-02-01 Dave Love <fx@gnu.org> * mm-util.el (mm-mule4-p, mm-enable-multibyte-mule4) - (mm-disable-multibyte-mule4) + (mm-disable-multibyte-mule4) (mm-with-unibyte-current-buffer-mule4): Deleted. * gnus-sum.el (gnus-summary-mode, gnus-summary-display-article)
--- a/lisp/term/w32-win.el Mon Feb 04 09:38:49 2008 +0000 +++ b/lisp/term/w32-win.el Mon Feb 04 09:39:04 2008 +0000 @@ -1111,7 +1111,9 @@ ;;; Set default known names for image libraries (setq image-library-alist '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") - (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll") + (png "libpng12d.dll" "libpng12.dll" "libpng.dll" + ;; these are libpng 1.2.8 from GTK+ + "libpng13d.dll" "libpng13.dll") (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") (tiff "libtiff3.dll" "libtiff.dll") (gif "giflib4.dll" "libungif4.dll" "libungif.dll")