From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 22 Jan 2002 07:37:39 +0000 (+0000)
Subject: (ispell-help): Clean up echo area if user quits.
X-Git-Tag: emacs-21.2~162
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=933e1313b91806acbc516dc55f0d9f7512733869;p=emacs.git

(ispell-help): Clean up echo area if user quits.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd1df126db2..d6bfe13dd9a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-22  Richard M. Stallman  <rms@gnu.org>
+
+	* net/ange-ftp.el (ange-ftp-canonize-filename): Avoid duplicate
+	slash if DIR is just slash.
+
+	* textmodes/ispell.el (ispell-help): Clean up echo area if user quits.
+
 2002-01-20  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* international/quail.el (quail-start-translation)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 24a96213eaf..830af2a7377 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1886,14 +1886,16 @@ SPC:   Accept word this time.
 	      (insert (concat help-1 "\n" help-2 "\n" help-3))
 	      (sit-for 5)
 	      (kill-buffer "*Ispell Help*"))
-	  (select-window (minibuffer-window))
-	  (erase-buffer)
-	  (if (not version18p) (message nil))
-	  ;;(set-minibuffer-window (selected-window))
-	  (enlarge-window 2)
-	  (insert (concat help-1 "\n" help-2 "\n" help-3))
-	  (sit-for 5)
-	  (erase-buffer))))))
+	  (unwind-protect
+	      (progn
+		(select-window (minibuffer-window))
+		(erase-buffer)
+		(if (not version18p) (message nil))
+		;;(set-minibuffer-window (selected-window))
+		(enlarge-window 2)
+		(insert (concat help-1 "\n" help-2 "\n" help-3))
+		(sit-for 5))
+	    (erase-buffer)))))))
 
 
 (defun lookup-words (word &optional lookup-dict)