Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad4a05f912907bab89b86b05f23ace0ab2559767..60e2b50e5c4555134c57baebbc2648b8d1f81ee7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2015-03-03  Agustín Martín Domingo <agustin6martin@gmail.com>
+
+       * textmodes/ispell.el (ispell-aspell-find-dictionary): Make sure
+       .dat files for aspell dicts are also searched for in location
+       described by `ispell-aspell-dict-dir', matching aspell's dict-dir
+       variable.
+
+2015-03-03  Agustín Martín Domingo <agustin6martin@gmail.com>
+
+       * textmodes/ispell.el (ispell-dicts-name2locale-equivs-alist)
+       (ispell-hunspell-fill-dictionary-entry)
+       (ispell-find-hunspell-dictionaries)
+       (ispell-set-spellchecker-params): New generic name for
+       `ispell-hunspell-dictionary-equivs-alist'.
+       (ispell-aspell-add-aliases): Also use
+       `ispell-dicts-name2locale-equivs-alist' to get aspell aliases for
+       standard dict names.
+
 2015-03-03  Glenn Morris  <rgm@gnu.org>
 
        * net/browse-url.el (browse-url-firefox-startup-arguments):
@@ -25,7 +43,6 @@
        * net/tramp-sh.el (tramp-remote-process-environment): Disable paging
        with PAGER=cat.  (Bug#19870)
 
-2015-03-03  Glenn Morris  <rgm@gnu.org>
 2015-03-03  Glenn Morris  <rgm@gnu.org>
 
        * textmodes/flyspell.el (flyspell-duplicate-distance):
@@ -47,7 +64,6 @@
        (flyspell-word-search-backward, flyspell-word-search-forward):
        Search as full word with defined casechars, not as substring.
 
-2015-03-03  Juri Linkov  <juri@linkov.net>
 2015-03-03  Juri Linkov  <juri@linkov.net>
 
        Better support for the case of typing RET on the prompt in comint.
@@ -71,7 +87,6 @@
        * net/network-stream.el (network-stream-open-tls): Respect the
        :end-of-capability setting.
 
-2015-03-03  Juri Linkov  <juri@linkov.net>
 2015-03-03  Juri Linkov  <juri@linkov.net>
 
        Revert the previous change of comint-line-beginning-position callers,
@@ -99,7 +114,6 @@
        mapcar, not mapc, to create the other half of fill-info.
        (Bug#19763)
 
-2015-03-03  Nicolas Petton  <nicolas@petton.fr>
 2015-03-03  Nicolas Petton  <nicolas@petton.fr>
 
        * emacs-lisp/authors.el (authors-ignored-files)
@@ -120,7 +134,6 @@
        * emacs-lisp/authors.el (authors-obsolete-files-regexps)
        (authors-valid-file-names, authors-renamed-files-alist): Additions.
 
-2015-03-03  Alan Mackenzie  <acm@muc.de>
 2015-03-03  Alan Mackenzie  <acm@muc.de>
 
        CC Mode: Stop Font Lock forcing fontification from BOL.  Fixes