lisp/ChangeLog: Synch with Emacs trunk

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2de054a..df8b88f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -96,9 +96,8 @@
        Fixes Bug#19438.
        * message.el (message-make-fqdn):
        * nnvirtual.el (nnvirtual-retrieve-headers)
-       (nnvirtual-update-xref-header):
-       Prefer (system-name) to system-name, and avoid naming
-       locals 'system-name'.
+       (nnvirtual-update-xref-header): Prefer (system-name) to system-name,
+       and avoid naming locals 'system-name'.
 
 2014-12-29  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -112,8 +111,8 @@
 
 2014-12-19  Andreas Schwab  <schwab@linux-m68k.org>
 
-       * gnus-group.el (gnus-read-ephemeral-bug-group): Bind
-       coding-system-for-read and coding-system-for-write only around
+       * gnus-group.el (gnus-read-ephemeral-bug-group):
+       Bind coding-system-for-read and coding-system-for-write only around
        with-temp-file, and make buffer unibyte.  Don't write temp file twice.
 
 2014-12-18  Paul Eggert  <eggert@cs.ucla.edu>
@@ -183,9 +182,9 @@
 
 2014-12-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-       * gnus-art.el (gnus-article-mime-handles): Refactored out into own
+       * gnus-art.el (gnus-article-mime-handles): Refactor out into own
        function for reuse.
-       (gnus-mime-buttonize-attachments-in-header): Adjusted.
+       (gnus-mime-buttonize-attachments-in-header): Adjust.
 
 2014-12-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -512,8 +511,8 @@
 
 2014-05-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-art.el (gnus-mime-inline-part, gnus-mm-display-part): Don't
-       delete next part button; keep spacing between buttons.
+       * gnus-art.el (gnus-mime-inline-part, gnus-mm-display-part):
+       Don't delete next part button; keep spacing between buttons.
 
 2014-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -562,8 +561,8 @@
        * mm-decode.el (mm-display-part): Don't insert a newline in the top.
        (mm-shr): Make undisplayer unbreakable.
 
-       * mm-view.el (mm-inline-image-emacs, mm-inline-image-xemacs): Don't
-       insert excessive newline.
+       * mm-view.el (mm-inline-image-emacs, mm-inline-image-xemacs):
+       Don't insert excessive newline.
        (mm-inline-text-html-render-with-w3m, mm-inline-text)
        (mm-insert-inline): Make undisplayer unbreakable.