[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108440: ChangeLog merge fix

[Glenn Morris]

------------------------------------------------------------
revno: 108440
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-31 16:06:04 -0400
message:
  ChangeLog merge fix
modified:
  lisp/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-31 17:14:46 +0000
+++ b/lisp/ChangeLog    2012-05-31 20:06:04 +0000
@@ -19,12 +19,6 @@
        * desktop.el (desktop-read): Clear previous and next buffers for
        all windows and bury *Messages* buffer (bug#11556).
 
-2012-05-31  Eli Zaretskii  <address@hidden>
-
-       * mail/sendmail.el (mail-yank-region): Recognize
-       rmail-yank-current-message in addition to insert-buffer.  Fixes
-       mail-mode's "C-c C-r" that otherwise does nothing when invoked in
-
 2012-05-31  Stefan Monnier  <address@hidden>
 
        Add `declare' for `defun'.  Align `defmacro's with it.