/[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.13.2.6 by miles, Mon Oct 25 04:22:24 2004 UTC revision 1.13.2.7 by miles, Fri Oct 29 02:05:13 2004 UTC
# Line 1142  commands given here will actually operat Line 1142  commands given here will actually operat
1142  ;;;###autoload  ;;;###autoload
1143  (defun calc (&optional arg full-display interactive)  (defun calc (&optional arg full-display interactive)
1144    "The Emacs Calculator.  Full documentation is listed under \"calc-mode\"."    "The Emacs Calculator.  Full documentation is listed under \"calc-mode\"."
1145    (interactive "P")    (interactive "P\ni\np")
1146    (if arg    (if arg
1147        (unless (eq arg 0)        (unless (eq arg 0)
1148          (calc-extensions)          (calc-extensions)
# Line 1188  commands given here will actually operat Line 1188  commands given here will actually operat
1188               (window-point full-display)               (window-point full-display)
1189               (select-window full-display))               (select-window full-display))
1190          (calc-check-defines)          (calc-check-defines)
1191          (when (and calc-said-hello          (when (and calc-said-hello interactive)
                    (or (interactive-p) interactive))  
1192            (sit-for 2)            (sit-for 2)
1193            (message ""))            (message ""))
1194          (setq calc-said-hello t)))))          (setq calc-said-hello t)))))
1195    
1196  ;;;###autoload  ;;;###autoload
1197  (defun full-calc ()  (defun full-calc (&optional interactive)
1198    "Invoke the Calculator and give it a full-sized window."    "Invoke the Calculator and give it a full-sized window."
1199    (interactive)    (interactive "p")
1200    (calc nil t (interactive-p)))    (calc nil t interactive))
1201    
1202  (defun calc-same-interface (arg)  (defun calc-same-interface (arg)
1203    "Invoke the Calculator using the most recent interface (calc or calc-keypad)."    "Invoke the Calculator using the most recent interface (calc or calc-keypad)."
# Line 1215  commands given here will actually operat Line 1214  commands given here will actually operat
1214            (calc arg calc-full-mode t))))))            (calc arg calc-full-mode t))))))
1215    
1216    
1217  (defun calc-quit (&optional non-fatal)  (defun calc-quit (&optional non-fatal interactive)
1218    (interactive)    (interactive "i\np")
1219    (and calc-standalone-flag (not non-fatal)    (and calc-standalone-flag (not non-fatal)
1220         (save-buffers-kill-emacs nil))         (save-buffers-kill-emacs nil))
1221    (if (and (equal (buffer-name) "*Gnuplot Trail*")    (if (and (equal (buffer-name) "*Gnuplot Trail*")
# Line 1226  commands given here will actually operat Line 1225  commands given here will actually operat
1225        (calc-edit-cancel)        (calc-edit-cancel)
1226      (if (eq major-mode 'MacEdit-mode)      (if (eq major-mode 'MacEdit-mode)
1227          (MacEdit-cancel-edit)          (MacEdit-cancel-edit)
1228        (if (and (interactive-p)        (if (and interactive
1229                 calc-embedded-info                 calc-embedded-info
1230                 (eq (current-buffer) (aref calc-embedded-info 0)))                 (eq (current-buffer) (aref calc-embedded-info 0)))
1231            (calc-embedded nil)            (calc-embedded nil)
# Line 1266  or a list containing a character positio Line 1265  or a list containing a character positio
1265    (calc-do-calc-eval str separator args))    (calc-do-calc-eval str separator args))
1266    
1267  ;;;###autoload  ;;;###autoload
1268  (defun calc-keypad ()  (defun calc-keypad (&optional interactive)
1269    "Invoke the Calculator in \"visual keypad\" mode.    "Invoke the Calculator in \"visual keypad\" mode.
1270  This is most useful in the X window system.  This is most useful in the X window system.
1271  In this mode, click on the Calc \"buttons\" using the left mouse button.  In this mode, click on the Calc \"buttons\" using the left mouse button.
1272  Or, position the cursor manually and do M-x calc-keypad-press."  Or, position the cursor manually and do M-x calc-keypad-press."
1273    (interactive)    (interactive "p")
1274    (calc-extensions)    (calc-extensions)
1275    (calc-do-keypad calc-full-mode (interactive-p)))    (calc-do-keypad calc-full-mode interactive))
1276    
1277  ;;;###autoload  ;;;###autoload
1278  (defun full-calc-keypad ()  (defun full-calc-keypad (&optional interactive)
1279    "Invoke the Calculator in full-screen \"visual keypad\" mode.    "Invoke the Calculator in full-screen \"visual keypad\" mode.
1280  See calc-keypad for details."  See calc-keypad for details."
1281    (interactive)    (interactive "p")
1282    (calc-extensions)    (calc-extensions)
1283    (calc-do-keypad t (interactive-p)))    (calc-do-keypad t interactive))
1284    
1285    
1286  (defvar calc-aborted-prefix nil)  (defvar calc-aborted-prefix nil)
# Line 1802  If mouse is pressed in Calc window, push Line 1801  If mouse is pressed in Calc window, push
1801    val)    val)
1802    
1803    
1804  (defun calc-trail-display (flag &optional no-refresh)  (defun calc-trail-display (flag &optional no-refresh interactive)
1805    (interactive "P")    (interactive "P\ni\np")
1806    (let ((win (get-buffer-window (calc-trail-buffer))))    (let ((win (get-buffer-window (calc-trail-buffer))))
1807      (if (setq calc-display-trail      (if (setq calc-display-trail
1808                (not (if flag (memq flag '(nil 0)) win)))                (not (if flag (memq flag '(nil 0)) win)))
# Line 1817  If mouse is pressed in Calc window, push Line 1816  If mouse is pressed in Calc window, push
1816                 (setq overlay-arrow-string calc-trail-overlay                 (setq overlay-arrow-string calc-trail-overlay
1817                       overlay-arrow-position calc-trail-pointer)                       overlay-arrow-position calc-trail-pointer)
1818                 (or no-refresh                 (or no-refresh
1819                     (if (interactive-p)                     (if interactive
1820                         (calc-do-refresh)                         (calc-do-refresh)
1821                       (calc-refresh))))))                       (calc-refresh))))))
1822        (if win        (if win
# Line 1825  If mouse is pressed in Calc window, push Line 1824  If mouse is pressed in Calc window, push
1824              (delete-window win)              (delete-window win)
1825              (calc-wrapper              (calc-wrapper
1826               (or no-refresh               (or no-refresh
1827                   (if (interactive-p)                   (if interactive
1828                       (calc-do-refresh)                       (calc-do-refresh)
1829                     (calc-refresh))))))))                     (calc-refresh))))))))
1830    calc-trail-buffer)    calc-trail-buffer)

Legend:
Removed from v.1.13.2.6  
changed lines
  Added in v.1.13.2.7

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