diff options
| -rw-r--r-- | lisp/calculator.el | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/calculator.el b/lisp/calculator.el index 7d7c73ae327..0aef07b1750 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el | |||
| @@ -312,8 +312,8 @@ user-defined operators, use `calculator-user-operators' instead.") | |||
| 312 | 312 | ||
| 313 | It it possible have a unary prefix version of a binary operator if it | 313 | It it possible have a unary prefix version of a binary operator if it |
| 314 | comes later in this list. If the list begins with the symbol 'nobind, | 314 | comes later in this list. If the list begins with the symbol 'nobind, |
| 315 | then no key binding will take place -- this is only useful for predefined | 315 | then no key binding will take place -- this is only useful for |
| 316 | keys. | 316 | predefined keys. |
| 317 | 317 | ||
| 318 | Use `calculator-user-operators' to add operators to this list, see its | 318 | Use `calculator-user-operators' to add operators to this list, see its |
| 319 | documentation for an example.") | 319 | documentation for an example.") |
| @@ -1124,9 +1124,15 @@ If optional argument FORCE is non-nil, don't use the cached string." | |||
| 1124 | " " | 1124 | " " |
| 1125 | (and calculator-display-fragile | 1125 | (and calculator-display-fragile |
| 1126 | calculator-saved-list | 1126 | calculator-saved-list |
| 1127 | (= (car calculator-stack) | 1127 | ;; Hack: use `eq' to compare the number: it's a |
| 1128 | (nth calculator-saved-ptr | 1128 | ;; flonum, so `eq' means that its the actual |
| 1129 | calculator-saved-list)) | 1129 | ;; number rather than a computation that had an |
| 1130 | ;; equal result (eg, enter 1,3,2, use "v" to see | ||
| 1131 | ;; the average -- it now shows "2" instead of | ||
| 1132 | ;; "2 [3]"). | ||
| 1133 | (eq (car calculator-stack) | ||
| 1134 | (nth calculator-saved-ptr | ||
| 1135 | calculator-saved-list)) | ||
| 1130 | (if (= 0 calculator-saved-ptr) | 1136 | (if (= 0 calculator-saved-ptr) |
| 1131 | (format "[%s]" (length calculator-saved-list)) | 1137 | (format "[%s]" (length calculator-saved-list)) |
| 1132 | (format "[%s/%s]" | 1138 | (format "[%s/%s]" |