/[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.39 by jpb, Wed Dec 8 06:07:27 2004 UTC revision 1.40 by jpb, Fri Dec 31 03:29:25 2004 UTC
# Line 1167  commands given here will actually operat Line 1167  commands given here will actually operat
1167        (exit-recursive-edit)        (exit-recursive-edit)
1168      (if (eq major-mode 'calc-edit-mode)      (if (eq major-mode 'calc-edit-mode)
1169          (calc-edit-finish arg)          (calc-edit-finish arg)
1170        (if (eq major-mode 'MacEdit-mode)        (if calc-was-keypad-mode
1171            (MacEdit-finish-edit)            (calc-keypad)
1172          (if calc-was-keypad-mode          (calc arg calc-full-mode t)))))
             (calc-keypad)  
           (calc arg calc-full-mode t))))))  
   
1173    
1174  (defun calc-quit (&optional non-fatal interactive)  (defun calc-quit (&optional non-fatal interactive)
1175    (interactive "i\np")    (interactive "i\np")
# Line 1183  commands given here will actually operat Line 1180  commands given here will actually operat
1180        (exit-recursive-edit))        (exit-recursive-edit))
1181    (if (eq major-mode 'calc-edit-mode)    (if (eq major-mode 'calc-edit-mode)
1182        (calc-edit-cancel)        (calc-edit-cancel)
1183      (if (eq major-mode 'MacEdit-mode)      (if (and interactive
1184          (MacEdit-cancel-edit)               calc-embedded-info
1185        (if (and interactive               (eq (current-buffer) (aref calc-embedded-info 0)))
1186                 calc-embedded-info          (calc-embedded nil)
1187                 (eq (current-buffer) (aref calc-embedded-info 0)))        (unless (eq major-mode 'calc-mode)
1188            (calc-embedded nil)          (calc-create-buffer))
1189          (unless (eq major-mode 'calc-mode)        (run-hooks 'calc-end-hook)
1190            (calc-create-buffer))        (setq calc-undo-list nil calc-redo-list nil)
1191          (run-hooks 'calc-end-hook)        (mapcar (function (lambda (v) (set-default v (symbol-value v))))
1192          (setq calc-undo-list nil calc-redo-list nil)                calc-local-var-list)
1193          (mapcar (function (lambda (v) (set-default v (symbol-value v))))        (let ((buf (current-buffer))
1194                  calc-local-var-list)              (win (get-buffer-window (current-buffer)))
1195          (let ((buf (current-buffer))              (kbuf (get-buffer "*Calc Keypad*")))
1196                (win (get-buffer-window (current-buffer)))          (delete-windows-on (calc-trail-buffer))
1197                (kbuf (get-buffer "*Calc Keypad*")))          (if (and win
1198            (delete-windows-on (calc-trail-buffer))                   (< (window-height win) (1- (frame-height)))
1199            (if (and win                   (= (window-width win) (frame-width))  ; avoid calc-keypad
1200                     (< (window-height win) (1- (frame-height)))                   (not (get-buffer-window "*Calc Keypad*")))
1201                     (= (window-width win) (frame-width))  ; avoid calc-keypad              (setq calc-window-height (- (window-height win) 2)))
1202                     (not (get-buffer-window "*Calc Keypad*")))          (progn
1203                (setq calc-window-height (- (window-height win) 2)))            (delete-windows-on buf)
1204            (progn            (delete-windows-on kbuf))
1205              (delete-windows-on buf)          (bury-buffer buf)
1206              (delete-windows-on kbuf))          (bury-buffer calc-trail-buffer)
1207            (bury-buffer buf)          (and kbuf (bury-buffer kbuf))))))
           (bury-buffer calc-trail-buffer)  
           (and kbuf (bury-buffer kbuf)))))))  
1208    
1209  ;;;###autoload  ;;;###autoload
1210  (defun quick-calc ()  (defun quick-calc ()

Legend:
Removed from v.1.39  
changed lines
  Added in v.1.40

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