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

[Miles Bader]

Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.21.4.5 emacs/lisp/calc/calc.el:1.21.4.6
*** emacs/lisp/calc/calc.el:1.21.4.5    Fri Oct 22 10:13:34 2004
--- emacs/lisp/calc/calc.el     Wed Oct 27 05:42:03 2004
***************
*** 1142,1148 ****
  ;;;###autoload
  (defun calc (&optional arg full-display interactive)
    "The Emacs Calculator.  Full documentation is listed under \"calc-mode\"."
!   (interactive "P")
    (if arg
        (unless (eq arg 0)
        (calc-extensions)
--- 1142,1148 ----
  ;;;###autoload
  (defun calc (&optional arg full-display interactive)
    "The Emacs Calculator.  Full documentation is listed under \"calc-mode\"."
!   (interactive "P\ni\np")
    (if arg
        (unless (eq arg 0)
        (calc-extensions)
***************
*** 1188,1204 ****
             (window-point full-display)
             (select-window full-display))
        (calc-check-defines)
!       (when (and calc-said-hello
!                  (or (interactive-p) interactive))
          (sit-for 2)
          (message ""))
        (setq calc-said-hello t)))))
  
  ;;;###autoload
! (defun full-calc ()
    "Invoke the Calculator and give it a full-sized window."
!   (interactive)
!   (calc nil t (interactive-p)))
  
  (defun calc-same-interface (arg)
    "Invoke the Calculator using the most recent interface (calc or 
calc-keypad)."
--- 1188,1203 ----
             (window-point full-display)
             (select-window full-display))
        (calc-check-defines)
!       (when (and calc-said-hello interactive)
          (sit-for 2)
          (message ""))
        (setq calc-said-hello t)))))
  
  ;;;###autoload
! (defun full-calc (&optional interactive)
    "Invoke the Calculator and give it a full-sized window."
!   (interactive "p")
!   (calc nil t interactive))
  
  (defun calc-same-interface (arg)
    "Invoke the Calculator using the most recent interface (calc or 
calc-keypad)."
***************
*** 1215,1222 ****
          (calc arg calc-full-mode t))))))
  
  
! (defun calc-quit (&optional non-fatal)
!   (interactive)
    (and calc-standalone-flag (not non-fatal)
         (save-buffers-kill-emacs nil))
    (if (and (equal (buffer-name) "*Gnuplot Trail*")
--- 1214,1221 ----
          (calc arg calc-full-mode t))))))
  
  
! (defun calc-quit (&optional non-fatal interactive)
!   (interactive "i\np")
    (and calc-standalone-flag (not non-fatal)
         (save-buffers-kill-emacs nil))
    (if (and (equal (buffer-name) "*Gnuplot Trail*")
***************
*** 1226,1232 ****
        (calc-edit-cancel)
      (if (eq major-mode 'MacEdit-mode)
        (MacEdit-cancel-edit)
!       (if (and (interactive-p)
               calc-embedded-info
               (eq (current-buffer) (aref calc-embedded-info 0)))
          (calc-embedded nil)
--- 1225,1231 ----
        (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)
***************
*** 1266,1287 ****
    (calc-do-calc-eval str separator args))
  
  ;;;###autoload
! (defun calc-keypad ()
    "Invoke the Calculator in \"visual keypad\" mode.
  This is most useful in the X window system.
  In this mode, click on the Calc \"buttons\" using the left mouse button.
  Or, position the cursor manually and do M-x calc-keypad-press."
!   (interactive)
    (calc-extensions)
!   (calc-do-keypad calc-full-mode (interactive-p)))
  
  ;;;###autoload
! (defun full-calc-keypad ()
    "Invoke the Calculator in full-screen \"visual keypad\" mode.
  See calc-keypad for details."
!   (interactive)
    (calc-extensions)
!   (calc-do-keypad t (interactive-p)))
  
  
  (defvar calc-aborted-prefix nil)
--- 1265,1286 ----
    (calc-do-calc-eval str separator args))
  
  ;;;###autoload
! (defun calc-keypad (&optional interactive)
    "Invoke the Calculator in \"visual keypad\" mode.
  This is most useful in the X window system.
  In this mode, click on the Calc \"buttons\" using the left mouse button.
  Or, position the cursor manually and do M-x calc-keypad-press."
!   (interactive "p")
    (calc-extensions)
!   (calc-do-keypad calc-full-mode interactive))
  
  ;;;###autoload
! (defun full-calc-keypad (&optional interactive)
    "Invoke the Calculator in full-screen \"visual keypad\" mode.
  See calc-keypad for details."
!   (interactive "p")
    (calc-extensions)
!   (calc-do-keypad t interactive))
  
  
  (defvar calc-aborted-prefix nil)
***************
*** 1802,1809 ****
    val)
  
  
! (defun calc-trail-display (flag &optional no-refresh)
!   (interactive "P")
    (let ((win (get-buffer-window (calc-trail-buffer))))
      (if (setq calc-display-trail
              (not (if flag (memq flag '(nil 0)) win)))
--- 1801,1808 ----
    val)
  
  
! (defun calc-trail-display (flag &optional no-refresh interactive)
!   (interactive "P\ni\np")
    (let ((win (get-buffer-window (calc-trail-buffer))))
      (if (setq calc-display-trail
              (not (if flag (memq flag '(nil 0)) win)))
***************
*** 1817,1823 ****
               (setq overlay-arrow-string calc-trail-overlay
                     overlay-arrow-position calc-trail-pointer)
               (or no-refresh
!                  (if (interactive-p)
                       (calc-do-refresh)
                     (calc-refresh))))))
        (if win
--- 1816,1822 ----
               (setq overlay-arrow-string calc-trail-overlay
                     overlay-arrow-position calc-trail-pointer)
               (or no-refresh
!                  (if interactive
                       (calc-do-refresh)
                     (calc-refresh))))))
        (if win
***************
*** 1825,1831 ****
            (delete-window win)
            (calc-wrapper
             (or no-refresh
!                (if (interactive-p)
                     (calc-do-refresh)
                   (calc-refresh))))))))
    calc-trail-buffer)
--- 1824,1830 ----
            (delete-window win)
            (calc-wrapper
             (or no-refresh
!                (if interactive
                     (calc-do-refresh)
                   (calc-refresh))))))))
    calc-trail-buffer)