(calc-quit): Make sure that the keypad buffer exists before delete its windows.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36a48b22c8a..13a84f6576c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-04  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc.el (calc-quit): Make sure that the keypad buffer
+        exists before deleting its windows.
+
 2008-11-04  Chong Yidong  <cyd@stupidchicken.com>
 
         * server.el (server-process-filter): Don't call
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index d49e2bd2aa3..4c6375b1183 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1431,7 +1431,7 @@ commands given here will actually operate on the *Calculator* stack."
             (setq calc-window-height (- (window-height win) 2)))
         (progn
           (delete-windows-on buf)
-          (delete-windows-on kbuf))
+          (and kbuf (delete-windows-on kbuf)))
         (bury-buffer buf)
         (bury-buffer calc-trail-buffer)
         (and kbuf (bury-buffer kbuf))))))