aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2014-02-13 20:35:59 -0600
committerJay Belanger2014-02-13 20:35:59 -0600
commit2804e0bd8f9a58d8d9e77965cdb34f495ee7f292 (patch)
tree280f375e1f3a08c0e06e462de2b6b937cb8f4eb0
parent019ff874af94a889899011c7da5e73f4edf7ce9c (diff)
downloademacs-2804e0bd8f9a58d8d9e77965cdb34f495ee7f292.tar.gz
emacs-2804e0bd8f9a58d8d9e77965cdb34f495ee7f292.zip
lisp/calc/calc-menu.el (calc-vectors-menu): Remove menu item for
incorrect keybinding. doc/misc/calc.texi (Single-Variable Statistics): Remove mention of incorrect keybinding.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/calc.texi6
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-menu.el13
4 files changed, 20 insertions, 9 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a8eaa25a5e5..50c6f26ac16 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12014-02-14 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc.texi (Single-Variable Statistics): Remove mention of
4 incorrect keybinding.
5
12014-02-12 Paul Eggert <eggert@cs.ucla.edu> 62014-02-12 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * texinfo.tex: Update from gnulib. 8 * texinfo.tex: Update from gnulib.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 1700aee9dc1..4010d6c8c19 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -20756,9 +20756,9 @@ mean, then repeating until the two values converge.
20756$$ a_{i+1} = { a_i + b_i \over 2 } , \qquad b_{i+1} = \sqrt{a_i b_i} $$ 20756$$ a_{i+1} = { a_i + b_i \over 2 } , \qquad b_{i+1} = \sqrt{a_i b_i} $$
20757@end tex 20757@end tex
20758 20758
20759@cindex Root-mean-square 20759@c @cindex Root-mean-square
20760Another commonly used mean, the RMS (root-mean-square), can be computed 20760@c Another commonly used mean, the RMS (root-mean-square), can be computed
20761for a vector of numbers simply by using the @kbd{A} command. 20761@c for a vector of numbers simply by using the @kbd{A} command.
20762 20762
20763@kindex u S 20763@kindex u S
20764@pindex calc-vector-sdev 20764@pindex calc-vector-sdev
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0d08e0a6e8..787fa26f30c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-02-14 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc/calc-menu.el (calc-vectors-menu): Remove menu item for
4 incorrect keybinding.
5
12014-02-13 Daniel Colascione <dancol@dancol.org> 62014-02-13 Daniel Colascione <dancol@dancol.org>
2 7
3 * progmodes/flymake.el (flymake-post-syntax-check): Widen buffer 8 * progmodes/flymake.el (flymake-post-syntax-check): Widen buffer
diff --git a/lisp/calc/calc-menu.el b/lisp/calc/calc-menu.el
index 201dc58a68b..9dbb40aa824 100644
--- a/lisp/calc/calc-menu.el
+++ b/lisp/calc/calc-menu.el
@@ -917,12 +917,13 @@
917 (call-interactively 'calc-vector-geometric-mean))) 917 (call-interactively 'calc-vector-geometric-mean)))
918 :keys "H u G" 918 :keys "H u G"
919 :active (>= (calc-stack-size) 1)] 919 :active (>= (calc-stack-size) 1)]
920 ["RMS(1:)" 920 ;; ["RMS(1:)"
921 (progn (require 'calc-arith) 921 ;; (progn (require 'calc-arith)
922 (call-interactively 'calc-abs)) 922 ;; (call-interactively 'calc-abs))
923 :keys "A" 923 ;; :keys "A"
924 :active (>= (calc-stack-size) 1) 924 ;; :active (>= (calc-stack-size) 1)
925 :help "The root-mean-square, or quadratic mean"]) 925 ;; :help "The root-mean-square, or quadratic mean"]
926 )
926 ["Abbreviate long vectors" 927 ["Abbreviate long vectors"
927 (progn 928 (progn
928 (require 'calc-mode) 929 (require 'calc-mode)