[Emacs-diffs] /srv/bzr/emacs/trunk r102846: ChangeLog merge fixes.

[Glenn Morris]

------------------------------------------------------------
revno: 102846
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-14 09:42:40 -0800
message:
  ChangeLog merge fixes.
modified:
  admin/ChangeLog
  doc/misc/ChangeLog
  etc/ChangeLog
  lisp/ChangeLog
  src/ChangeLog

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-01-14 17:18:41 +0000
+++ b/admin/ChangeLog   2011-01-14 17:42:40 +0000
@@ -2,7 +2,6 @@
 
        * admin.el (set-copyright): Also handle \year in refcards/*.tex.
 
-2011-01-14  Eli Zaretskii  <address@hidden>
 2011-01-14  Glenn Morris  <address@hidden>
 
        * bzrmerge.el: Require cl when compiling.

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-01-14 17:18:41 +0000
+++ b/doc/misc/ChangeLog        2011-01-14 17:42:40 +0000
@@ -2,7 +2,6 @@
 
        * nxml-mode.texi (Introduction): Fix file name typos.
 
-2011-01-14  Glenn Morris  <address@hidden>
 2011-01-13  Christian Ohler  <address@hidden>
 
        * ert.texi: New file.

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2011-01-14 17:18:41 +0000
+++ b/etc/ChangeLog     2011-01-14 17:42:40 +0000
@@ -12,11 +12,6 @@
        * refcards/vipcard.tex, refcards/viperCard.tex:
        Update short copyright year to 2011.
 
-2011-01-14  Kenichi Handa  <address@hidden>
-
-       * NEWS: Describe the changes for rmail's MIME handling.
-
-2011-01-14  W. Martin Borgert <address@hidden>  (tiny change)
 2011-01-13  Christian Ohler  <address@hidden>
 
        * NEWS: Mention ERT.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-14 17:18:41 +0000
+++ b/lisp/ChangeLog    2011-01-14 17:42:40 +0000
@@ -7,33 +7,6 @@
 
        * progmodes/python.el (python-mode): Don't impose font-lock (bug#3628).
 
-2011-01-14  Stefan Monnier  <address@hidden>
-
-       * files.el (file-local-variables-alist):
-       Make permanent-local (bug#7767).
-
-2011-01-14  Glenn Morris  <address@hidden>
-
-       * version.el (emacs-copyright): Set short copyright year to 2011.
-
-2011-01-14  Mark Lillibridge  <address@hidden>  (tiny change)
-
-       * mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering
-       an existing temp buffer.  (Bug#7746)
-
-2011-01-14  Glenn Morris  <address@hidden>
-
-       * mail/mail-utils.el (mail-mbox-from): Handle From: headers with
-       multiple addresses.  (Bug#7760)
-
-2011-01-14  Michael Albinus  <address@hidden>
-
-       * net/tramp.el (tramp-methods): Add recursive options to "scpc",
-       "scpx", "pscp" and "psftp".
-
-2011-01-14  Eli Zaretskii  <address@hidden>
-
-       * term/w32-win.el (image-library-alist): Set up correctly for
 2011-01-14  Kim F. Storm  <address@hidden>
 
        * emulation/cua-base.el (cua--init-keymaps):

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-14 17:18:41 +0000
+++ b/src/ChangeLog     2011-01-14 17:42:40 +0000
@@ -1,9 +1,3 @@
-2011-01-14  Eli Zaretskii  <address@hidden>
-
-       * image.c (png_jmpbuf): Remove definition.
-       (my_png_error, png_load): Don't use png_jmpbuf.
-
-2011-01-14  Eli Zaretskii  <address@hidden>
 2011-01-11  Tassilo Horn  <address@hidden>
 
        * image.c (imagemagick_load_image, Finit_image_library): Free