[Emacs-diffs] Changes to emacs/lisp/calc/calc.el

[Jay Belanger]

Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.39 emacs/lisp/calc/calc.el:1.40
*** emacs/lisp/calc/calc.el:1.39        Wed Dec  8 06:07:27 2004
--- emacs/lisp/calc/calc.el     Fri Dec 31 03:29:25 2004
***************
*** 1167,1178 ****
        (exit-recursive-edit)
      (if (eq major-mode 'calc-edit-mode)
        (calc-edit-finish arg)
!       (if (eq major-mode 'MacEdit-mode)
!         (MacEdit-finish-edit)
!       (if calc-was-keypad-mode
!           (calc-keypad)
!         (calc arg calc-full-mode t))))))
! 
  
  (defun calc-quit (&optional non-fatal interactive)
    (interactive "i\np")
--- 1167,1175 ----
        (exit-recursive-edit)
      (if (eq major-mode 'calc-edit-mode)
        (calc-edit-finish arg)
!       (if calc-was-keypad-mode
!           (calc-keypad)
!         (calc arg calc-full-mode t)))))
  
  (defun calc-quit (&optional non-fatal interactive)
    (interactive "i\np")
***************
*** 1183,1215 ****
        (exit-recursive-edit))
    (if (eq major-mode 'calc-edit-mode)
        (calc-edit-cancel)
!     (if (eq major-mode 'MacEdit-mode)
!       (MacEdit-cancel-edit)
!       (if (and interactive
!              calc-embedded-info
!              (eq (current-buffer) (aref calc-embedded-info 0)))
!         (calc-embedded nil)
!       (unless (eq major-mode 'calc-mode)
!         (calc-create-buffer))
!       (run-hooks 'calc-end-hook)
!       (setq calc-undo-list nil calc-redo-list nil)
!       (mapcar (function (lambda (v) (set-default v (symbol-value v))))
!               calc-local-var-list)
!       (let ((buf (current-buffer))
!             (win (get-buffer-window (current-buffer)))
!             (kbuf (get-buffer "*Calc Keypad*")))
!         (delete-windows-on (calc-trail-buffer))
!         (if (and win
!                  (< (window-height win) (1- (frame-height)))
!                  (= (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)
!         (bury-buffer calc-trail-buffer)
!         (and kbuf (bury-buffer kbuf)))))))
  
  ;;;###autoload
  (defun quick-calc ()
--- 1180,1210 ----
        (exit-recursive-edit))
    (if (eq major-mode 'calc-edit-mode)
        (calc-edit-cancel)
!     (if (and interactive
!              calc-embedded-info
!              (eq (current-buffer) (aref calc-embedded-info 0)))
!         (calc-embedded nil)
!       (unless (eq major-mode 'calc-mode)
!         (calc-create-buffer))
!       (run-hooks 'calc-end-hook)
!       (setq calc-undo-list nil calc-redo-list nil)
!       (mapcar (function (lambda (v) (set-default v (symbol-value v))))
!               calc-local-var-list)
!       (let ((buf (current-buffer))
!             (win (get-buffer-window (current-buffer)))
!             (kbuf (get-buffer "*Calc Keypad*")))
!         (delete-windows-on (calc-trail-buffer))
!         (if (and win
!                  (< (window-height win) (1- (frame-height)))
!                  (= (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)
!         (bury-buffer calc-trail-buffer)
!         (and kbuf (bury-buffer kbuf))))))
  
  ;;;###autoload
  (defun quick-calc ()