diff options
| author | Colin Walters | 2002-03-29 22:55:39 +0000 |
|---|---|---|
| committer | Colin Walters | 2002-03-29 22:55:39 +0000 |
| commit | 1cc6997c3888a53dcea52f2a967787bb14f447f8 (patch) | |
| tree | 7e3655962770cc1754a761325048f0b8cb44a5f2 | |
| parent | 214b39be9a09aaaf43ad763fd23c96f5f455513d (diff) | |
| download | emacs-1cc6997c3888a53dcea52f2a967787bb14f447f8.tar.gz emacs-1cc6997c3888a53dcea52f2a967787bb14f447f8.zip | |
(calc-was-split): Var deleted.
(calc): Remove reference to it.
(calc): Ditto.
(calc-quit): Ditto.
| -rw-r--r-- | lisp/calc/calc.el | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 31df6bf36d6..8ab0ba61c87 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el | |||
| @@ -709,7 +709,6 @@ This can safely be nil as long as the Calc files are on the load-path.") | |||
| 709 | calc-version-date "Mon Nov 19 2001" | 709 | calc-version-date "Mon Nov 19 2001" |
| 710 | calc-trail-pointer nil ; "Current" entry in trail buffer. | 710 | calc-trail-pointer nil ; "Current" entry in trail buffer. |
| 711 | calc-trail-overlay nil ; Value of overlay-arrow-string. | 711 | calc-trail-overlay nil ; Value of overlay-arrow-string. |
| 712 | calc-was-split nil ; Had multiple windows before Calc. | ||
| 713 | calc-undo-list nil ; List of previous operations for undo. | 712 | calc-undo-list nil ; List of previous operations for undo. |
| 714 | calc-redo-list nil ; List of recent undo operations. | 713 | calc-redo-list nil ; List of recent undo operations. |
| 715 | calc-main-buffer nil ; Pointer to Calculator buffer. | 714 | calc-main-buffer nil ; Pointer to Calculator buffer. |
| @@ -1171,7 +1170,6 @@ commands given here will actually operate on the *Calculator* stack." | |||
| 1171 | (switch-to-buffer (current-buffer) t) | 1170 | (switch-to-buffer (current-buffer) t) |
| 1172 | (if (get-buffer-window (current-buffer)) | 1171 | (if (get-buffer-window (current-buffer)) |
| 1173 | (select-window (get-buffer-window (current-buffer))) | 1172 | (select-window (get-buffer-window (current-buffer))) |
| 1174 | (setq calc-was-split nil) | ||
| 1175 | (if (and (boundp 'calc-window-hook) calc-window-hook) | 1173 | (if (and (boundp 'calc-window-hook) calc-window-hook) |
| 1176 | (run-hooks 'calc-window-hook) | 1174 | (run-hooks 'calc-window-hook) |
| 1177 | (let ((w (get-largest-window))) | 1175 | (let ((w (get-largest-window))) |
| @@ -1179,9 +1177,6 @@ commands given here will actually operate on the *Calculator* stack." | |||
| 1179 | (> (window-height w) | 1177 | (> (window-height w) |
| 1180 | (+ window-min-height calc-window-height 2))) | 1178 | (+ window-min-height calc-window-height 2))) |
| 1181 | (progn | 1179 | (progn |
| 1182 | (or (one-window-p) | ||
| 1183 | (setq calc-was-split (list w (window-height w) | ||
| 1184 | (selected-window)))) | ||
| 1185 | (setq w (split-window w | 1180 | (setq w (split-window w |
| 1186 | (- (window-height w) | 1181 | (- (window-height w) |
| 1187 | calc-window-height 2) | 1182 | calc-window-height 2) |
| @@ -1258,8 +1253,7 @@ commands given here will actually operate on the *Calculator* stack." | |||
| 1258 | (= (window-width win) (frame-width)) ; avoid calc-keypad | 1253 | (= (window-width win) (frame-width)) ; avoid calc-keypad |
| 1259 | (not (get-buffer-window "*Calc Keypad*"))) | 1254 | (not (get-buffer-window "*Calc Keypad*"))) |
| 1260 | (setq calc-window-height (- (window-height win) 2))) | 1255 | (setq calc-window-height (- (window-height win) 2))) |
| 1261 | (if calc-was-split | 1256 | (progn |
| 1262 | (calc-delete-windows-keep buf kbuf) | ||
| 1263 | (delete-windows-on buf) | 1257 | (delete-windows-on buf) |
| 1264 | (delete-windows-on kbuf)) | 1258 | (delete-windows-on kbuf)) |
| 1265 | (bury-buffer buf) | 1259 | (bury-buffer buf) |