* doc/misc/calc.texi (Logarithmic Units): Rename calc-logunits-dblevel

  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-ext.el (calc-init-extensions): Rename calc-logunits-dblevel
  and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
  respectively.

* calc/calc-units.el (calc-dblevel): Rename from calc-logunits-dblevel.
  (calc-nplevel): Rename from calc-logunits-nplevel.

5 files changed, 26 insertions, 10 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index aec9f9cf858..bc8fc03d2c8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-06  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
+        and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
+        respectively.
+
 2011-03-03  Glenn Morris  <rgm@gnu.org>
 
         * url.texi (Dealing with HTTP documents): Remove reference to
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index b9d4f8c4a23..b5316b8414f 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -28251,18 +28251,18 @@ The @kbd{H l q} [@code{fieldquant}] command behaves like @kbd{l q} but
 computes field quantities instead of power quantities.
 
 @kindex l d
-@pindex calc-logunits-dblevel
+@pindex calc-dblevel
 @tindex dbpowerlevel
 @tindex dbfieldlevel
 @kindex l n
-@pindex calc-logunits-nplevel
+@pindex calc-nplevel
 @tindex nppowerlevel
 @tindex npfieldlevel
-The @kbd{l d} (@code{calc-logunits-dblevel}) [@code{dbpowerlevel}]
+The @kbd{l d} (@code{calc-dblevel}) [@code{dbpowerlevel}]
 command will compute the decibel level of a power quantity using the
 default reference level; @kbd{H l d} [@code{dbfieldlevel}] will
 compute the decibel level of a field quantity.  The commands @kbd{l n} 
-(@code{calc-logunits-nplevel}) [@code{nppowerlevel}] and @kbd{H l n} 
+(@code{calc-nplevel}) [@code{nppowerlevel}] and @kbd{H l n} 
 [@code{npfieldlevel}] will similarly compute neper levels.  With the
 capital @kbd{O} prefix these commands will read a reference level
 from the stack; in an algebraic formula the reference level can be
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 380d12443da..0beb3db3a44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-06  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc-ext.el (calc-init-extensions):
+        Rename calc-logunits-dblevel and calc-logunits-nplevel to
+        calc-dblevel and calc-nplevel, respectively.
+
+        * calc/calc-units.el (calc-dblevel): Rename from
+        calc-logunits-dblevel.
+        (calc-nplevel): Rename from calc-logunits-nplevel.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
         * emacs-lisp/package.el (package-archives): Accept either ordinary
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index ec4e902f33d..30fe3ba6238 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -423,8 +423,8 @@
 
   (define-key calc-mode-map "l" nil)
   (define-key calc-mode-map "lq" 'calc-logunits-quantity)
-  (define-key calc-mode-map "ld" 'calc-logunits-dblevel)
-  (define-key calc-mode-map "ln" 'calc-logunits-nplevel)
+  (define-key calc-mode-map "ld" 'calc-dblevel)
+  (define-key calc-mode-map "ln" 'calc-nplevel)
   (define-key calc-mode-map "l+" 'calc-logunits-add)
   (define-key calc-mode-map "l-" 'calc-logunits-sub)
   (define-key calc-mode-map "l*" 'calc-logunits-mul)
@@ -1176,8 +1176,8 @@ calc-convert-temperature calc-convert-units calc-define-unit
 calc-enter-units-table calc-explain-units calc-extract-units
 calc-get-unit-definition calc-permanent-units calc-quick-units
 calc-remove-units calc-simplify-units calc-undefine-unit
-calc-view-units-table calc-logunits-quantity calc-logunits-dblevel
-calc-logunits-nplevel calc-logunits-add calc-logunits-sub
+calc-view-units-table calc-logunits-quantity calc-dblevel
+calc-nplevel calc-logunits-add calc-logunits-sub
 calc-logunits-mul calc-logunits-divide)
 
  ("calc-vec" calc-arrange-vector calc-build-vector calc-cnorm
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 0d58bc757f2..4f853546cfd 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1837,7 +1837,7 @@ In symbolic mode, return the list (^ a b)."
     (setq ref (math-read-expr calc-logunits-power-reference)))
   (math-logunits-level val ref nil t))
 
-(defun calc-logunits-dblevel (arg)
+(defun calc-dblevel (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-hyperbolic)
@@ -1848,7 +1848,7 @@ In symbolic mode, return the list (^ a b)."
          (calc-binary-op "ludb" 'calcFunc-dbpowerlevel arg)
        (calc-unary-op "ludb" 'calcFunc-dbpowerlevel arg)))))
 
-(defun calc-logunits-nplevel (arg)
+(defun calc-nplevel (arg)
   (interactive "P")
   (calc-slow-wrapper
    (if (calc-is-hyperbolic)