[Emacs-diffs] /srv/bzr/emacs/trunk r103676: * lisp/calc-units.el (calcFunc-lupquant): Rename from

[Jay Belanger]

------------------------------------------------------------
revno: 103676
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Wed 2011-03-16 21:25:36 -0500
message:
  * 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.
modified:
  doc/misc/calc.texi
  lisp/calc/calc-ext.el
  lisp/calc/calc-units.el

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2011-03-17 01:30:08 +0000
+++ b/doc/misc/calc.texi        2011-03-17 02:25:36 +0000
@@ -28238,17 +28238,17 @@
 
 @kindex l q
 @pindex calc-lu-quant
address@hidden pquant
address@hidden fquant
-The @kbd{l q} (@code{calc-lu-quant}) address@hidden
address@hidden lupquant
address@hidden lufquant
+The @kbd{l q} (@code{calc-lu-quant}) address@hidden
 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} address@hidden command behaves like @kbd{l q} but
+The @kbd{H l q} address@hidden command behaves like @kbd{l q} but
 computes field quantities instead of power quantities.
 
 @kindex l d
@@ -36222,10 +36222,10 @@
 @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)}
address@hidden      a@:      l q   @:             @:        @:pquant@:(a)}
address@hidden    a b@:    O l q   @:             @:        @:pquant@:(a,b)}
address@hidden      a@:    H l q   @:             @:        @:fquant@:(a)}
address@hidden    a b@:  O H l q   @:             @:        @:fquant@:(a,b)}
address@hidden      a@:      l q   @:             @:        @:lupquant@:(a)}
address@hidden    a b@:    O l q   @:             @:        @:lupquant@:(a,b)}
address@hidden      a@:    H l q   @:             @:        @:lufquant@:(a)}
address@hidden    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)}

=== modified file 'lisp/calc/calc-ext.el'
--- a/lisp/calc/calc-ext.el     2011-03-17 01:30:08 +0000
+++ b/lisp/calc/calc-ext.el     2011-03-17 02:25:36 +0000
@@ -945,7 +945,7 @@
 
  ("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

=== modified file 'lisp/calc/calc-units.el'
--- a/lisp/calc/calc-units.el   2011-03-17 01:30:08 +0000
+++ b/lisp/calc/calc-units.el   2011-03-17 02:25:36 +0000
@@ -1780,12 +1780,12 @@
 (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 @@
   (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."