Merge from emacs--rel--22

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

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 099abd58a3f4a5af57c2e0c4666e3d06d1222ac0..5f416f616125df4a45b1fda51e9e4d132712efaf 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -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 --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 7106a380d030b0ce4e7ba2e04845410349b8cc4d..d4774379555ba750e9753b9299cb7f07c3308fdf 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -130,7 +130,7 @@ Of course, you should substitute the proper years and copyright holder.
 
 @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 --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 331ec594bf05511a2c74f4d419701b6db00b9f61..f5151d3ac7b52bd49f7001cf171d7c7679338082 100644 (file)
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -50,9 +50,9 @@ Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
 license is included in the section entitled ``GNU Free Documentation
 License'' in the Emacs manual.
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+(a) The FSF's Back-Cover Text is: ``You have the freedom to
+copy and modify this GNU manual.  Buying copies from the FSF
+supports it in developing GNU and promoting software freedom.''
 
 This document is part of a collection distributed under the GNU Free
 Documentation License.  If you want to distribute this document

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc138506d798b5c346ef069fc1407a8180a537fe..3e20def85e3e2ad9546e8a055e63fd90e58c3478 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6cadea3beb7026f44999a8b6f8ea230e21bdd732..fd659b8a2db9a2d21cae6ae2a690b5e366e10a7e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index a9bd19f9a3d4625b3f4bcd12a0edb5878d2d1fd8..62fd6edd9190ae732c0e603fc937b72d9c88be36 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1111,7 +1111,9 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
 ;;; 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")