diff options
| author | Juanma Barranquero | 2008-11-25 00:30:47 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-11-25 00:30:47 +0000 |
| commit | a1ff7705dcd0f6d010ab356b562850c4abb1b998 (patch) | |
| tree | 5057c7ecb18db795edea7c72a18b121ad454bcf0 | |
| parent | 923dfbaa56324aab7b62d8c9c6ec51fc78165d95 (diff) | |
| download | emacs-a1ff7705dcd0f6d010ab356b562850c4abb1b998.tar.gz emacs-a1ff7705dcd0f6d010ab356b562850c4abb1b998.zip | |
* calculator.el (calculator-op-or-exp): Reflow docstring.
(calculator-remove-zeros, calculator-repR, calculator-repL):
Fix typos in docstrings.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/calculator.el | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3fc10c4bec..6063ff945b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-11-25 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * calculator.el (calculator-op-or-exp): Reflow docstring. | ||
| 4 | (calculator-remove-zeros, calculator-repR, calculator-repL): | ||
| 5 | Fix typos in docstrings. | ||
| 6 | |||
| 1 | 2008-11-24 Chong Yidong <cyd@stupidchicken.com> | 7 | 2008-11-24 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 | ||
| 3 | * log-view.el (log-view-annotate-version): Let vc-annotate manage | 9 | * log-view.el (log-view-annotate-version): Let vc-annotate manage |
diff --git a/lisp/calculator.el b/lisp/calculator.el index def2c540cd4..c843a3d0290 100644 --- a/lisp/calculator.el +++ b/lisp/calculator.el | |||
| @@ -996,8 +996,8 @@ If radix output mode is active, decrease the grouping size." | |||
| 996 | (calculator-standard-displayer 'right (cadr disp)))))))) | 996 | (calculator-standard-displayer 'right (cadr disp)))))))) |
| 997 | 997 | ||
| 998 | (defun calculator-remove-zeros (numstr) | 998 | (defun calculator-remove-zeros (numstr) |
| 999 | "Get a number string NUMSTR and remove unnecessary zeroes. | 999 | "Get a number string NUMSTR and remove unnecessary zeros. |
| 1000 | the behavior of this function is controlled by | 1000 | The behavior of this function is controlled by |
| 1001 | `calculator-remove-zeros'." | 1001 | `calculator-remove-zeros'." |
| 1002 | (cond ((and (eq calculator-remove-zeros t) | 1002 | (cond ((and (eq calculator-remove-zeros t) |
| 1003 | (string-match "\\.0+\\([eE][+-]?[0-9]*\\)?$" numstr)) | 1003 | (string-match "\\.0+\\([eE][+-]?[0-9]*\\)?$" numstr)) |
| @@ -1457,8 +1457,7 @@ Optional string argument KEYS will force using it as the keys entered." | |||
| 1457 | (defun calculator-op-or-exp () | 1457 | (defun calculator-op-or-exp () |
| 1458 | "Either enter an operator or a digit. | 1458 | "Either enter an operator or a digit. |
| 1459 | Used with +/- for entering them as digits in numbers like 1e-3 (there is | 1459 | Used with +/- for entering them as digits in numbers like 1e-3 (there is |
| 1460 | no need for negative numbers since these are handled by unary | 1460 | no need for negative numbers since these are handled by unary operators)." |
| 1461 | operators)." | ||
| 1462 | (interactive) | 1461 | (interactive) |
| 1463 | (if (and (not calculator-display-fragile) | 1462 | (if (and (not calculator-display-fragile) |
| 1464 | calculator-curnum | 1463 | calculator-curnum |
| @@ -1755,7 +1754,7 @@ Used by `calculator-paste' and `get-register'." | |||
| 1755 | (calculator-quit)) | 1754 | (calculator-quit)) |
| 1756 | 1755 | ||
| 1757 | (defun calculator-repR (x) | 1756 | (defun calculator-repR (x) |
| 1758 | "Repeats the last binary operation with its second argument and X. | 1757 | "Repeat the last binary operation with its second argument and X. |
| 1759 | To use this, apply a binary operator (evaluate it), then call this." | 1758 | To use this, apply a binary operator (evaluate it), then call this." |
| 1760 | (if calculator-last-opXY | 1759 | (if calculator-last-opXY |
| 1761 | ;; avoid rebinding calculator-last-opXY | 1760 | ;; avoid rebinding calculator-last-opXY |
| @@ -1765,7 +1764,7 @@ To use this, apply a binary operator (evaluate it), then call this." | |||
| 1765 | x)) | 1764 | x)) |
| 1766 | 1765 | ||
| 1767 | (defun calculator-repL (x) | 1766 | (defun calculator-repL (x) |
| 1768 | "Repeats the last binary operation with its first argument and X. | 1767 | "Repeat the last binary operation with its first argument and X. |
| 1769 | To use this, apply a binary operator (evaluate it), then call this." | 1768 | To use this, apply a binary operator (evaluate it), then call this." |
| 1770 | (if calculator-last-opXY | 1769 | (if calculator-last-opXY |
| 1771 | ;; avoid rebinding calculator-last-opXY | 1770 | ;; avoid rebinding calculator-last-opXY |
| @@ -1807,7 +1806,7 @@ To use this, apply a binary operator (evaluate it), then call this." | |||
| 1807 | ;; If y is odd | 1806 | ;; If y is odd |
| 1808 | -1.0e+INF) | 1807 | -1.0e+INF) |
| 1809 | (t | 1808 | (t |
| 1810 | ;; | 1809 | ;; |
| 1811 | 1.0e+INF))) | 1810 | 1.0e+INF))) |
| 1812 | (error 0.0e+NaN))) | 1811 | (error 0.0e+NaN))) |
| 1813 | 1812 | ||