aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2005-04-09 18:59:36 +0000
committerJay Belanger2005-04-09 18:59:36 +0000
commit02bf5ab9c2b41eebbcab4215d65c75b5661eccda (patch)
tree19d78fe68953d986209acc2f6fc076012980142c
parent23e3383d016136432d076dee0ef0fff79148e6fb (diff)
downloademacs-02bf5ab9c2b41eebbcab4215d65c75b5661eccda.tar.gz
emacs-02bf5ab9c2b41eebbcab4215d65c75b5661eccda.zip
(math-standard-units): Redefine Watt hour as W*hr.
-rw-r--r--lisp/calc/calc-units.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 4b3c284ddad..6c694bc5ba8 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1,6 +1,6 @@
1;;; calc-units.el --- unit conversion functions for Calc 1;;; calc-units.el --- unit conversion functions for Calc
2 2
3;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. 3;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
4 4
5;; Author: David Gillespie <daveg@synaptics.com> 5;; Author: David Gillespie <daveg@synaptics.com>
6;; Maintainer: Jay Belanger <belanger@truman.edu> 6;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -137,7 +137,7 @@
137 ( men "100/invcm" "Inverse energy in meters" ) 137 ( men "100/invcm" "Inverse energy in meters" )
138 ( Hzen "h Hz" "Energy in Hertz") 138 ( Hzen "h Hz" "Energy in Hertz")
139 ( Ken "k K" "Energy in Kelvins") 139 ( Ken "k K" "Energy in Kelvins")
140 ( Wh "W h" "Watt hour") 140 ( Wh "W hr" "Watt hour")
141 ( Ws "W s" "Watt second") 141 ( Ws "W s" "Watt second")
142 142
143 ;; Power 143 ;; Power