Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed28911497a949b1de8c0954c129fc02eaea3d1e..121a395e63d2b7de25ef6402b15353562f41e072 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,6 @@
+2015-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * dired.el (dired-delete-file): Doc fix.  (Bug#20021)
 2015-03-06  Sergio Durigan Junior  <sergiodj@sergiodj.net>
            Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
@@ -238,8 +241,8 @@
 2015-03-03  Agustín Martín Domingo  <agustin6martin@gmail.com>
 
        Improve string search in `flyspell-word-search-*`. (Bug#16800)
-       * flyspell.el (flyspell-duplicate-distance): Limit default search
-       distance for duplicated words to 40000.
+       * textmodes/flyspell.el (flyspell-duplicate-distance): Limit
+       default search distance for duplicated words to 40000.
        (flyspell-word-search-backward, flyspell-word-search-forward):
        Search as full word with defined casechars, not as substring.