diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
| commit | 9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch) | |
| tree | e10467a42658a374d5cdb7bb25fc94016abdad7a /lisp/calc | |
| parent | b8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff) | |
| parent | a130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff) | |
| download | emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz | |
Merge from trunk; add Bug#.
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-units.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index dcbf845c371..9d2583085a2 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -302,7 +302,7 @@ (defvar math-additional-units nil - "*Additional units table for user-defined units. + "Additional units table for user-defined units. Must be formatted like `math-standard-units'. If you change this, be sure to set `math-units-table' to nil to ensure that the combined units table will be rebuilt.") diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 41cdb491cfa..5224d1aa4f8 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -817,7 +817,7 @@ If nil, selections displayed but ignored.") Used by `calc-user-invocation'.") (defcalcmodevar calc-show-banner t - "*If non-nil, show a friendly greeting above the stack.") + "If non-nil, show a friendly greeting above the stack.") (defconst calc-local-var-list '(calc-stack calc-stack-top |