# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1202117944 0
# Node ID 5f89bbfccdc3aaf42818ac0a28bb09fdc8ed7da1
# Parent  ab078721fd90d7a12838a35d57f35be21ac3befd# Parent  5bd0d726b8e7f29797711ed3bd6c5802199c80ad
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048

diff -r ab078721fd90 -r 5f89bbfccdc3 doc/emacs/ChangeLog
--- 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.
diff -r ab078721fd90 -r 5f89bbfccdc3 doc/emacs/maintaining.texi
--- 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
diff -r ab078721fd90 -r 5f89bbfccdc3 doc/misc/tramp.texi
Binary file doc/misc/tramp.texi has changed
diff -r ab078721fd90 -r 5f89bbfccdc3 lisp/ChangeLog
--- 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
diff -r ab078721fd90 -r 5f89bbfccdc3 lisp/gnus/ChangeLog
--- 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)
diff -r ab078721fd90 -r 5f89bbfccdc3 lisp/term/w32-win.el
--- 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")