From: Glenn Morris Date: Fri, 14 Jan 2011 17:42:40 +0000 (-0800) Subject: ChangeLog merge fixes. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~233^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15a1cca8ecc4b5a7330f377e608a34552fc9fc0a;p=emacs.git ChangeLog merge fixes. --- diff --git a/admin/ChangeLog b/admin/ChangeLog index 5edbbdac653..5807863a910 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -2,7 +2,6 @@ * admin.el (set-copyright): Also handle \year in refcards/*.tex. -2011-01-14 Eli Zaretskii 2011-01-14 Glenn Morris * bzrmerge.el: Require cl when compiling. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 92b61e75688..24efb00e552 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -2,7 +2,6 @@ * nxml-mode.texi (Introduction): Fix file name typos. -2011-01-14 Glenn Morris 2011-01-13 Christian Ohler * ert.texi: New file. diff --git a/etc/ChangeLog b/etc/ChangeLog index 5e8b164ce05..27f0a28c9f4 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -12,11 +12,6 @@ * refcards/vipcard.tex, refcards/viperCard.tex: Update short copyright year to 2011. -2011-01-14 Kenichi Handa - - * NEWS: Describe the changes for rmail's MIME handling. - -2011-01-14 W. Martin Borgert (tiny change) 2011-01-13 Christian Ohler * NEWS: Mention ERT. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 813746ca6df..4ce53e701a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -7,33 +7,6 @@ * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628). -2011-01-14 Stefan Monnier - - * files.el (file-local-variables-alist): - Make permanent-local (bug#7767). - -2011-01-14 Glenn Morris - - * version.el (emacs-copyright): Set short copyright year to 2011. - -2011-01-14 Mark Lillibridge (tiny change) - - * mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering - an existing temp buffer. (Bug#7746) - -2011-01-14 Glenn Morris - - * mail/mail-utils.el (mail-mbox-from): Handle From: headers with - multiple addresses. (Bug#7760) - -2011-01-14 Michael Albinus - - * net/tramp.el (tramp-methods): Add recursive options to "scpc", - "scpx", "pscp" and "psftp". - -2011-01-14 Eli Zaretskii - - * term/w32-win.el (image-library-alist): Set up correctly for 2011-01-14 Kim F. Storm * emulation/cua-base.el (cua--init-keymaps): diff --git a/src/ChangeLog b/src/ChangeLog index f473da74811..4d2aa00cbd3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,3 @@ -2011-01-14 Eli Zaretskii - - * image.c (png_jmpbuf): Remove definition. - (my_png_error, png_load): Don't use png_jmpbuf. - -2011-01-14 Eli Zaretskii 2011-01-11 Tassilo Horn * image.c (imagemagick_load_image, Finit_image_library): Free