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

bc6922de · Jay Belanger · 650d0dbc · bc6922de · bc6922de
Commit bc6922de authored Nov 04, 2008 by Jay Belanger
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/calc/calc.el lisp/calc/calc.el +1 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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

--- 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))))))