From: Kim F. Storm <storm@cua.dk>
Date: Fri, 9 Jun 2006 13:04:13 +0000 (+0000)
Subject: (ispell-kill-ispell): If ispell has been
X-Git-Tag: emacs-pretest-22.0.90~2011
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a997209bd49f0a969b628f2036fa401245bb76d;p=emacs.git

(ispell-kill-ispell): If ispell has been
launched asynchronously, delete its process instead of being cool.
(ispell-async-processp): Check for `delete-process' existence
instead of `kill-process' one for consistency.
Submitted by: Michaël Cadilhac  <michael.cadilhac@lrde.org>
---

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 7bfedb1bd97..a4d873a543d 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -865,7 +865,7 @@ and added as a submenu of the \"Edit\" menu.")
 (defvar ispell-process nil
   "The process object for Ispell.")
 
-(defvar ispell-async-processp (and (fboundp 'kill-process)
+(defvar ispell-async-processp (and (fboundp 'delete-process)
 				   (fboundp 'process-send-string)
 				   (fboundp 'accept-process-output)
 				   ;;(fboundp 'start-process)
@@ -2572,15 +2572,7 @@ With NO-ERROR, just return non-nil if there was no Ispell running."
       (or no-error
 	  (error "There is no ispell process running!"))
     (if ispell-async-processp
-	(progn
-	  (process-send-eof ispell-process)
-	  (if (eq (ispell-process-status) 'run)
-	      (ispell-accept-output 1))
-	  (if (eq (ispell-process-status) 'run)
-	      (kill-process ispell-process))
-	  (while (not (or (eq (ispell-process-status) 'exit)
-			  (eq (ispell-process-status) 'signal)))
-	    (sleep-for 0.25)))
+	(delete-process ispell-process)
       ;; synchronous processes
       (ispell-send-string "\n")		; make sure side effects occurred.
       (kill-buffer ispell-output-buffer)