procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs--rel--22

Browse source 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1048
This commit is contained in:
Miles Bader 2008-02-04 09:39:04 +00:00
commit 093571c374
6 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/emacs/ChangeLog
View file

@ -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.

2
doc/emacs/maintaining.texi
View file

@ -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

6
doc/misc/tramp.texi
View file

@ -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

6
lisp/ChangeLog
View file

@ -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

2
lisp/gnus/ChangeLog
View file

@ -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)

4
lisp/term/w32-win.el
View file

@ -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")