aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/textmodes/ispell.el7
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9404dd2779..c95ffe0eb93 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12012-05-28 Agustín Martín Domingo <agustin.martin@hispalinux.es>
2
3 * textmodes/ispell.el (ispell-find-aspell-dictionaries):
4 Check for `ispell-dictionary-base-alist' instead of full
5 `ispell-dictionary-alist'.
6 (ispell-init-process): Show spellchecker when starting new Ispell
7 process.
8
12012-05-28 Stefan Monnier <monnier@iro.umontreal.ca> 92012-05-28 Stefan Monnier <monnier@iro.umontreal.ca>
2 10
3 * progmodes/vhdl-mode.el: Sync with upstream 3.33.28. 11 * progmodes/vhdl-mode.el: Sync with upstream 3.33.28.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 892f43e09fe..1dd2c9488ba 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -968,9 +968,9 @@ Internal use.")
968 ;; Ensure aspell's alias dictionary will override standard 968 ;; Ensure aspell's alias dictionary will override standard
969 ;; definitions. 969 ;; definitions.
970 (setq found (ispell-aspell-add-aliases found)) 970 (setq found (ispell-aspell-add-aliases found))
971 ;; Merge into FOUND any elements from the standard ispell-dictionary-alist 971 ;; Merge into FOUND any elements from the standard ispell-dictionary-base-alist
972 ;; which have no element in FOUND at all. 972 ;; which have no element in FOUND at all.
973 (dolist (dict ispell-dictionary-alist) 973 (dolist (dict ispell-dictionary-base-alist)
974 (unless (assoc (car dict) found) 974 (unless (assoc (car dict) found)
975 (setq found (nconc found (list dict))))) 975 (setq found (nconc found (list dict)))))
976 (setq ispell-aspell-dictionary-alist found) 976 (setq ispell-aspell-dictionary-alist found)
@@ -2707,7 +2707,8 @@ Keeps argument list for future Ispell invocations for no async support."
2707 (setq ispell-filter nil ispell-filter-continue nil) 2707 (setq ispell-filter nil ispell-filter-continue nil)
2708 ;; may need to restart to select new personal dictionary. 2708 ;; may need to restart to select new personal dictionary.
2709 (ispell-kill-ispell t) 2709 (ispell-kill-ispell t)
2710 (message "Starting new Ispell process [%s] ..." 2710 (message "Starting new Ispell process [%s::%s] ..."
2711 ispell-program-name
2711 (or ispell-local-dictionary ispell-dictionary "default")) 2712 (or ispell-local-dictionary ispell-dictionary "default"))
2712 (sit-for 0) 2713 (sit-for 0)
2713 (setq ispell-library-directory (ispell-check-version) 2714 (setq ispell-library-directory (ispell-check-version)