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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36a48b22c8a5820619a91e31311f8974f22f5970..13a84f6576c7daa422bb55c65973c177da48cbc0 100644 (file)
--- 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 d49e2bd2aa3aa31ed14847eb22d881eeb2f648d3..4c6375b11833e8acdb4909c505d12bf63e796d6c 100644 (file)
--- 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))))))