Merge from origin/emacs-24

c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases

Conflicts:
	lisp/ChangeLog

1 files changed, 0 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b1d9822f2f4..8acca6cca3f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -21,19 +21,16 @@
         mouse_position_for_popup only for X frames.  (Bug#19862)
 
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
         * buffer.c (syms_of_buffer): Doc fix.  (Bug#19841)
 
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
         * xfaces.c (map_tty_color): Use assoc_no_quit instead of
         assq_no_quit to fetch color definition by its string name.
         (Bug#19802)
 
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (move_it_in_display_line_to): Handle the case where the
         last character of a screen line is whitespace, and we are under
@@ -41,7 +38,6 @@
         (Bug#19769)
 
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
-2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (handle_stop, handle_single_display_spec)
         (next-element_from_image): Don't reset the