Mercurial > emacs
changeset 44247:b50c25ecef92
(calc-was-split): Var deleted.
(calc): Remove reference to it.
(calc): Ditto.
(calc-quit): Ditto.
| author | Colin Walters <walters@gnu.org> |
|---|---|
| date | Fri, 29 Mar 2002 22:55:39 +0000 |
| parents | 5e256893da08 |
| children | 50c7ae7c1bdc |
| files | lisp/calc/calc.el |
| diffstat | 1 files changed, 1 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc.el Fri Mar 29 22:54:49 2002 +0000 +++ b/lisp/calc/calc.el Fri Mar 29 22:55:39 2002 +0000 @@ -709,7 +709,6 @@ calc-version-date "Mon Nov 19 2001" calc-trail-pointer nil ; "Current" entry in trail buffer. calc-trail-overlay nil ; Value of overlay-arrow-string. - calc-was-split nil ; Had multiple windows before Calc. calc-undo-list nil ; List of previous operations for undo. calc-redo-list nil ; List of recent undo operations. calc-main-buffer nil ; Pointer to Calculator buffer. @@ -1171,7 +1170,6 @@ (switch-to-buffer (current-buffer) t) (if (get-buffer-window (current-buffer)) (select-window (get-buffer-window (current-buffer))) - (setq calc-was-split nil) (if (and (boundp 'calc-window-hook) calc-window-hook) (run-hooks 'calc-window-hook) (let ((w (get-largest-window))) @@ -1179,9 +1177,6 @@ (> (window-height w) (+ window-min-height calc-window-height 2))) (progn - (or (one-window-p) - (setq calc-was-split (list w (window-height w) - (selected-window)))) (setq w (split-window w (- (window-height w) calc-window-height 2) @@ -1258,8 +1253,7 @@ (= (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) + (progn (delete-windows-on buf) (delete-windows-on kbuf)) (bury-buffer buf)