# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1142092983 0
# Node ID 2413e06fae9c067db0f596947d22ae940acceb7b
# Parent  259ab035a71864f6948835e0b3103fc3dc0a97cd
*** empty log message ***

diff -r 259ab035a718 -r 2413e06fae9c lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Mar 11 16:02:38 2006 +0000
+++ b/lisp/ChangeLog	Sat Mar 11 16:03:03 2006 +0000
@@ -1,3 +1,10 @@
+2006-03-11  David Ponce  <david@dponce.com>
+
+	* ispell.el (ispell-find-aspell-dictionaries): Add aliases before
+	merging elements from the standard ispell-dictionary-alist.
+	(ispell-aspell-add-aliases): Add aliases to the passed dictionary
+	alist, and return the new alist.
+
 2006-03-11  Richard Stallman  <rms@gnu.org>
 
 	* mail/rmail.el (rmail-ignored-headers): Discard DomainKey-Signature.
diff -r 259ab035a718 -r 2413e06fae9c src/ChangeLog
--- a/src/ChangeLog	Sat Mar 11 16:02:38 2006 +0000
+++ b/src/ChangeLog	Sat Mar 11 16:03:03 2006 +0000
@@ -1,5 +1,8 @@
 2006-03-11  Eli Zaretskii  <eliz@gnu.org>
 
+	* w32term.c: Add x_fully_uncatch_errors and x_catching_errors to
+	the list of unused display error handling functions.
+
 	* eval.c (unwind_to_catch): Call x_fully_uncatch_errors only if
 	HAVE_X_WINDOWS.
 	(internal_condition_case, internal_condition_case_1)