aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2005-02-03 16:20:22 +0000
committerStefan Monnier2005-02-03 16:20:22 +0000
commitca97010c3a44c61515e59340ebf062b3dce6ff9b (patch)
tree52d633ab8d05499d01366a4865ce889f82f6606e
parenta41118cc4571147ce0d4ff80e9d088e6cf9fecd6 (diff)
downloademacs-ca97010c3a44c61515e59340ebf062b3dce6ff9b.tar.gz
emacs-ca97010c3a44c61515e59340ebf062b3dce6ff9b.zip
(ispell-internal-change-dictionary): Fix problem in recent changes, where
the ispell process was repeatedly killed & restarted.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/textmodes/ispell.el5
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 708a20b1403..2cf391c4807 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
12005-02-03 Stefan <monnier@iro.umontreal.ca> 12005-02-03 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * textmodes/ispell.el (ispell-internal-change-dictionary): Fix problem
4 in recent changes, where the ispell process was repeatedly
5 killed & restarted.
2 6
3 * international/mule-cmds.el (set-locale-environment): Set file-name 7 * international/mule-cmds.el (set-locale-environment): Set file-name
4 coding system to utf-8 on Darwin systems. 8 coding system to utf-8 on Darwin systems.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c403422801f..d5171125ae8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1,6 +1,7 @@
1;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2 1;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
2 2
3;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. 3;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
4;; Free Software Foundation, Inc.
4 5
5;; Author: Ken Stevens <k.stevens@ieee.org> 6;; Author: Ken Stevens <k.stevens@ieee.org>
6;; Maintainer: Ken Stevens <k.stevens@ieee.org> 7;; Maintainer: Ken Stevens <k.stevens@ieee.org>
@@ -2449,7 +2450,7 @@ With prefix argument, set the default dictionary."
2449 "Update the dictionary actually used by Ispell. 2450 "Update the dictionary actually used by Ispell.
2450This may kill the Ispell process; if so, 2451This may kill the Ispell process; if so,
2451a new one will be started when needed." 2452a new one will be started when needed."
2452 (let ((dict (or ispell-local-dictionary ispell-dictionary "default"))) 2453 (let ((dict (or ispell-local-dictionary ispell-dictionary)))
2453 (unless (equal ispell-current-dictionary dict) 2454 (unless (equal ispell-current-dictionary dict)
2454 (setq ispell-current-dictionary dict) 2455 (setq ispell-current-dictionary dict)
2455 (ispell-kill-ispell t)))) 2456 (ispell-kill-ispell t))))