* lisp/calc-units.el (calcFunc-lupquant): Rename from

  `calcFunc-pquant' (fixing previous commit).
  (calcFunc-lufquant): Rename from `calcFunc-fquant'
  (fixing previous commit).

* lisp/calc/calc-ext.el (calc-init-extensions): Update the names of the
  functions being autoloaded.

diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index d708bb47c0e27a34e13103351697cb5012bd6a40..f732eff5690fc4e9441f94e87a49f569ac08e577 100644 (file)
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28238,17 +28238,17 @@ capital @kbd{O} prefix is used.
 
 @kindex l q
 @pindex calc-lu-quant
-@tindex pquant
-@tindex fquant
-The @kbd{l q} (@code{calc-lu-quant}) [@code{pquant}]
+@tindex lupquant
+@tindex lufquant
+The @kbd{l q} (@code{calc-lu-quant}) [@code{lupquant}]
 command computes the power quantity corresponding to a given number of
 logarithmic units. With the capital @kbd{O} prefix, @kbd{O l q}, the
 reference level will be read from the top of the stack. (In an
-algebraic formula, @code{pquant} can be given an optional second
+algebraic formula, @code{lupquant} can be given an optional second
 argument which will be used for the reference level.) For example, 
 @code{20 dB @key{RET} l q} will return @code{100 mW}; 
 @code{20 dB @key{RET} 4 W @key{RET} O l q} will return @code{400 W}.   
-The @kbd{H l q} [@code{fquant}] command behaves like @kbd{l q} but
+The @kbd{H l q} [@code{lufquant}] command behaves like @kbd{l q} but
 computes field quantities instead of power quantities.
 
 @kindex l d
@@ -36222,10 +36222,10 @@ keystrokes are not listed in this summary.
 @r{    a b@:    O l n   @:             @:        @:nppower@:(a,b)}
 @r{      a@:    H l n   @:             @:        @:npfield@:(a)}
 @r{    a b@:  O H l n   @:             @:        @:npfield@:(a,b)}
-@r{      a@:      l q   @:             @:        @:pquant@:(a)}
-@r{    a b@:    O l q   @:             @:        @:pquant@:(a,b)}
-@r{      a@:    H l q   @:             @:        @:fquant@:(a)}
-@r{    a b@:  O H l q   @:             @:        @:fquant@:(a,b)}
+@r{      a@:      l q   @:             @:        @:lupquant@:(a)}
+@r{    a b@:    O l q   @:             @:        @:lupquant@:(a,b)}
+@r{      a@:    H l q   @:             @:        @:lufquant@:(a)}
+@r{    a b@:  O H l q   @:             @:        @:lufquant@:(a,b)}
 @r{      a@:      l s   @:             @:        @:spn@:(a)}
 @r{      a@:      l m   @:             @:        @:midi@:(a)}
 @r{      a@:      l f   @:             @:        @:freq@:(a)}

diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 57e7eabd1f92ffec28e28d682963d16580417991..9ea773fbb98ed9f2358f629cb1767edf5d739b49 100644 (file)
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -945,7 +945,7 @@ calcFunc-pclean calcFunc-pfloat calcFunc-pfrac)
 
  ("calc-units" calcFunc-usimplify calcFunc-lufadd calcFunc-lupadd
 calcFunc-lufsub calcFunc-lupsub calcFunc-lufmul calcFunc-lupmul
-calcFunc-lufdiv calcFunc-lupdiv calcFunc-fquant calcFunc-pquant
+calcFunc-lufdiv calcFunc-lupdiv calcFunc-lufquant calcFunc-lupquant
 calcFunc-dbfield calcFunc-dbpower calcFunc-npfield
 calcFunc-nppower calcFunc-spn calcFunc-midi calcFunc-freq
 math-build-units-table math-build-units-table-buffer

diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index a74cfb60c8d1732810c6999253c271555f7f33f6..43cb5828e85964ae563dcf0d94d139cefb19804e 100644 (file)
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1780,12 +1780,12 @@ In symbolic mode, return the list (^ a b)."
 (defvar calc-lu-field-reference)
 (defvar calc-lu-power-reference)
 
-(defun calcFunc-fquant (val &optional ref)
+(defun calcFunc-lufquant (val &optional ref)
   (unless ref
     (setq ref (math-read-expr calc-lu-field-reference)))
   (math-logunits-quant val ref nil))
 
-(defun calcFunc-pquant (val &optional ref)
+(defun calcFunc-lupquant (val &optional ref)
   (unless ref
     (setq ref (math-read-expr calc-lu-power-reference)))
   (math-logunits-quant val ref t))
@@ -1795,11 +1795,11 @@ In symbolic mode, return the list (^ a b)."
   (calc-slow-wrapper
    (if (calc-is-hyperbolic)
        (if (calc-is-option)
-           (calc-binary-op "lupq" 'calcFunc-fquant arg)
-         (calc-unary-op "lupq" 'calcFunc-fquant arg))
+           (calc-binary-op "lupq" 'calcFunc-lufquant arg)
+         (calc-unary-op "lupq" 'calcFunc-lufquant arg))
      (if (calc-is-option)
-         (calc-binary-op "lufq" 'calcFunc-pquant arg)
-       (calc-unary-op "lufq" 'calcFunc-pquant arg)))))
+         (calc-binary-op "lufq" 'calcFunc-lupquant arg)
+       (calc-unary-op "lufq" 'calcFunc-lupquant arg)))))
 
 (defun math-logunits-level (val ref db power)
   "Compute the value of VAL in decibels or nepers."