Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.9661
diff -c -r1.9661 ChangeLog
*** lisp/ChangeLog	1 Jun 2006 06:42:07 -0000	1.9661
--- lisp/ChangeLog	6 Jun 2006 20:42:02 -0000
***************
*** 1,3 ****
--- 1,11 ----
+ 2006-06-06  Michaël Cadilhac  <michael.cadilhac@lrde.org>
+ 
+ 	* textmodes/ispell.el (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.
+ 
  2006-06-01  Jan Djärv  <jan.h.d@swipnet.se>
  
  	* term/x-win.el: Change x-menu-bar-start to menu-bar-open.
Index: lisp/textmodes/ispell.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/ispell.el,v
retrieving revision 1.199
diff -c -r1.199 ispell.el
*** lisp/textmodes/ispell.el	21 May 2006 20:25:43 -0000	1.199
--- lisp/textmodes/ispell.el	6 Jun 2006 20:42:03 -0000
***************
*** 865,871 ****
  (defvar ispell-process nil
    "The process object for Ispell.")
  
! (defvar ispell-async-processp (and (fboundp 'kill-process)
  				   (fboundp 'process-send-string)
  				   (fboundp 'accept-process-output)
  				   ;;(fboundp 'start-process)
--- 865,871 ----
  (defvar ispell-process nil
    "The process object for Ispell.")
  
! (defvar ispell-async-processp (and (fboundp 'delete-process)
  				   (fboundp 'process-send-string)
  				   (fboundp 'accept-process-output)
  				   ;;(fboundp 'start-process)
***************
*** 2572,2586 ****
        (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)))
        ;; synchronous processes
        (ispell-send-string "\n")		; make sure side effects occurred.
        (kill-buffer ispell-output-buffer)
--- 2572,2578 ----
        (or no-error
  	  (error "There is no ispell process running!"))
      (if ispell-async-processp
! 	(delete-process ispell-process)
        ;; synchronous processes
        (ispell-send-string "\n")		; make sure side effects occurred.
        (kill-buffer ispell-output-buffer)