[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el
From: |
Colin Walters |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc.el |
Date: |
Fri, 29 Mar 2002 17:55:39 -0500 |
Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.9 emacs/lisp/calc/calc.el:1.10
*** emacs/lisp/calc/calc.el:1.9 Fri Feb 8 07:32:00 2002
--- emacs/lisp/calc/calc.el Fri Mar 29 17:55:39 2002
***************
*** 709,715 ****
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.
--- 709,714 ----
***************
*** 1171,1177 ****
(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)))
--- 1170,1175 ----
***************
*** 1179,1187 ****
(> (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)
--- 1177,1182 ----
***************
*** 1258,1265 ****
(= (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))
(bury-buffer buf)
--- 1253,1259 ----
(= (window-width win) (frame-width)) ; avoid calc-keypad
(not (get-buffer-window "*Calc Keypad*")))
(setq calc-window-height (- (window-height win) 2)))
! (progn
(delete-windows-on buf)
(delete-windows-on kbuf))
(bury-buffer buf)
- [Emacs-diffs] Changes to emacs/lisp/calc/calc.el,
Colin Walters <=