aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/calc/calc.el
diff options
context:
space:
mode:
authorJay Belanger <[email protected]>2010-04-16 21:47:25 -0500
committerJay Belanger <[email protected]>2010-04-16 21:47:25 -0500
commitd8b01fef6303a142dc9b6e26638d07f74e3e2ccd (patch)
tree9a3ca4f57f36ff18be63d11f73f037e2ae280e8e /lisp/calc/calc.el
parent0f4442efb1a1ec17448a8750e4c49defb5479982 (diff)
* calc-ext.el (calc-init-extensions): Add keybinding for 'calc-option'.
Add `calc-option-prefix-help' to calc-help autoloads. (calc-inverse): Add "Option" to message, as appropriate. (calc-hyperbolic): Add "Option" to message, as appropriate. (calc-option, calc-is-option): New functions. * calc-help.el (calc-full-help): Add `calc-option-help'. (calc-option-prefix-help): New function. * calc-misc.el (calc-help): Add "Option" entry. * calc.el (calc-local-var-list): Add `calc-option-flag'. (calc-option-flag): New variable. (calc-do): Set `calc-option-flag to nil. (calc-set-mode-line): Add "Opt " as appropriate.
Diffstat (limited to 'lisp/calc/calc.el')
-rw-r--r--lisp/calc/calc.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 2a6ec97ef5..c5a5458fff 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -797,6 +797,7 @@ Used by `calc-user-invocation'.")
calc-matrix-mode
calc-inverse-flag
calc-hyperbolic-flag
+ calc-option-flag
calc-keep-args-flag
calc-angle-mode
calc-number-radix
@@ -926,6 +927,8 @@ Used by `calc-user-invocation'.")
"If non-nil, next operation is Inverse.")
(defvar calc-hyperbolic-flag nil
"If non-nil, next operation is Hyperbolic.")
+(defvar calc-option-flag nil
+ "If non-nil, next operation has Optional behavior.")
(defvar calc-keep-args-flag nil
"If non-nil, next operation should not remove its arguments from stack.")
(defvar calc-function-open "("
@@ -1619,6 +1622,7 @@ See calc-keypad for details."
(calc-select-buffer)
(setq calc-inverse-flag nil
calc-hyperbolic-flag nil
+ calc-option-flag nil
calc-keep-args-flag nil)))
(when (memq 'do-edit calc-command-flags)
(switch-to-buffer (get-buffer-create "*Calc Edit*")))
@@ -1757,6 +1761,7 @@ See calc-keypad for details."
(> (calc-stack-size) 0)
(calc-top 1 'sel)) "Sel " "")
(if calc-display-dirty "Dirty " "")
+ (if calc-option-flag "Opt " "")
(if calc-inverse-flag "Inv " "")
(if calc-hyperbolic-flag "Hyp " "")
(if calc-keep-args-flag "Keep " "")