Commits

Anonymous committed 79f5b6c

Sync with normal package tree.
Patch from Karl.

Comments (0)

Files changed (2)

+2001-05-12  Karl M. Hegbloom  <karlheg@hegbloom.net>
+
+	* calc.el (calc-quit): Guard against kbuf eq nil
+
 2001-05-11  Ben Wing  <ben@xemacs.org>
 
 	* Makefile:
 	  (delete-windows-on (calc-trail-buffer))
 	  (if (and win
 		   (< (window-height win) (1- (frame-height)))
-		   (= (window-width win) (frame-width))  ; avoid calc-keypad
+		   (= (window-width win) (frame-width))	 ; avoid calc-keypad
 		   (not (get-buffer-window "*Calc Keypad*")))
 	      (setq calc-window-height (- (window-height win) 2)))
 	  (if calc-was-split
 	      (calc-delete-windows-keep buf kbuf)
 	    (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))))))