* 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.

2 files changed, 7 insertions, 7 deletions

diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 57e7eabd1f9..9ea773fbb98 100644
--- 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 a74cfb60c8d..43cb5828e85 100644
--- 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."