Merge from origin/emacs-25

[gnu-emacs] / lisp / ChangeLog.17

diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 1785a3367320937ebe9a9b355c6f0e361c88f60d..2f1957ad0caeea71a7e9105eb1a902bd5c8673c4 100644 (file)
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -1254,7 +1254,7 @@
 2015-03-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/shr.el (shr-insert): Remove soft hyphens.
-       (shr-insert): Also remove soft hypens from non-folded text.
+       (shr-insert): Also remove soft hyphens from non-folded text.
 
 2015-02-28  Eli Zaretskii  <eliz@gnu.org>
 
@@ -1758,7 +1758,7 @@
 
        * net/shr.el (shr-insert): Make sure the space inserted has the
        right font (for width).
-       (shr-fill-line): Preserve background colours when indenting/folding.
+       (shr-fill-line): Preserve background colors when indenting/folding.
        (shr-ensure-paragraph): Don't insert a new paragraph as the first
        item in a <li>.
 
@@ -6835,7 +6835,7 @@
        console as well (bug#18629).
        * w32-common-fns.el: Remove.
        * loadup.el: Don't load w32-common-fns.el.
-       * w32-fns.elc: Don't require w32-common-fns.
+       * w32-fns.el: Don't require w32-common-fns.
 
        * icomplete.el: Move Iswitchb autoload here.  Much simpler.
        * obsolete/iswitchb.el (iswitchb-mode): Use normal autoload cookie.