/[emacs]/emacs/lisp/calc/calc.el
ViewVC logotype

Diff of /emacs/lisp/calc/calc.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.9 by schwab, Fri Feb 8 12:32:00 2002 UTC revision 1.10 by walters, Fri Mar 29 22:55:39 2002 UTC
# Line 709  This can safely be nil as long as the Ca Line 709  This can safely be nil as long as the Ca
709          calc-version-date "Mon Nov 19 2001"          calc-version-date "Mon Nov 19 2001"
710          calc-trail-pointer nil          ; "Current" entry in trail buffer.          calc-trail-pointer nil          ; "Current" entry in trail buffer.
711          calc-trail-overlay nil          ; Value of overlay-arrow-string.          calc-trail-overlay nil          ; Value of overlay-arrow-string.
         calc-was-split nil              ; Had multiple windows before Calc.  
712          calc-undo-list nil              ; List of previous operations for undo.          calc-undo-list nil              ; List of previous operations for undo.
713          calc-redo-list nil              ; List of recent undo operations.          calc-redo-list nil              ; List of recent undo operations.
714          calc-main-buffer nil            ; Pointer to Calculator buffer.          calc-main-buffer nil            ; Pointer to Calculator buffer.
# Line 1171  commands given here will actually operat Line 1170  commands given here will actually operat
1170              (switch-to-buffer (current-buffer) t)              (switch-to-buffer (current-buffer) t)
1171            (if (get-buffer-window (current-buffer))            (if (get-buffer-window (current-buffer))
1172                (select-window (get-buffer-window (current-buffer)))                (select-window (get-buffer-window (current-buffer)))
             (setq calc-was-split nil)  
1173              (if (and (boundp 'calc-window-hook) calc-window-hook)              (if (and (boundp 'calc-window-hook) calc-window-hook)
1174                  (run-hooks 'calc-window-hook)                  (run-hooks 'calc-window-hook)
1175                (let ((w (get-largest-window)))                (let ((w (get-largest-window)))
# Line 1179  commands given here will actually operat Line 1177  commands given here will actually operat
1177                           (> (window-height w)                           (> (window-height w)
1178                              (+ window-min-height calc-window-height 2)))                              (+ window-min-height calc-window-height 2)))
1179                      (progn                      (progn
                       (or (one-window-p)  
                           (setq calc-was-split (list w (window-height w)  
                                                      (selected-window))))  
1180                        (setq w (split-window w                        (setq w (split-window w
1181                                              (- (window-height w)                                              (- (window-height w)
1182                                                 calc-window-height 2)                                                 calc-window-height 2)
# Line 1258  commands given here will actually operat Line 1253  commands given here will actually operat
1253                     (= (window-width win) (frame-width))  ; avoid calc-keypad                     (= (window-width win) (frame-width))  ; avoid calc-keypad
1254                     (not (get-buffer-window "*Calc Keypad*")))                     (not (get-buffer-window "*Calc Keypad*")))
1255                (setq calc-window-height (- (window-height win) 2)))                (setq calc-window-height (- (window-height win) 2)))
1256            (if calc-was-split            (progn
               (calc-delete-windows-keep buf kbuf)  
1257              (delete-windows-on buf)              (delete-windows-on buf)
1258              (delete-windows-on kbuf))              (delete-windows-on kbuf))
1259            (bury-buffer buf)            (bury-buffer buf)

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26