aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Goel2003-03-16 20:26:43 +0000
committerDeepak Goel2003-03-16 20:26:43 +0000
commit877d0199ee38250cbecafd2bab0780d8203ab972 (patch)
tree11aaac1143a0bd11c1124f0af58aaadb86ba92a1
parenta158ff811faadd2891b3db1f9b204388ac640c60 (diff)
downloademacs-877d0199ee38250cbecafd2bab0780d8203ab972.tar.gz
emacs-877d0199ee38250cbecafd2bab0780d8203ab972.zip
Alias UTC to GMT.
-rw-r--r--lisp/calc/calc-forms.el32
1 files changed, 17 insertions, 15 deletions
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index fcd395d4fd5..1791f03430a 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1229,21 +1229,23 @@
1229;;; Note: Longer names must appear before shorter names which are 1229;;; Note: Longer names must appear before shorter names which are
1230;;; substrings of them. 1230;;; substrings of them.
1231(defvar math-tzone-names 1231(defvar math-tzone-names
1232 '( ( "MEGT" -1 "MET" "METDST" ) ; Middle Europe 1232 '(( "UTC" 0 0)
1233 ( "METDST" -1 -1 ) ( "MET" -1 0 ) 1233 ( "MEGT" -1 "MET" "METDST" ) ; Middle Europe
1234 ( "MEGZ" -1 "MEZ" "MESZ" ) ( "MEZ" -1 0 ) ( "MESZ" -1 -1 ) 1234 ( "METDST" -1 -1 ) ( "MET" -1 0 )
1235 ( "WEGT" 0 "WET" "WETDST" ) ; Western Europe 1235 ( "MEGZ" -1 "MEZ" "MESZ" ) ( "MEZ" -1 0 ) ( "MESZ" -1 -1 )
1236 ( "WETDST" 0 -1 ) ( "WET" 0 0 ) 1236 ( "WEGT" 0 "WET" "WETDST" ) ; Western Europe
1237 ( "BGT" 0 "GMT" "BST" ) ( "GMT" 0 0 ) ( "BST" 0 -1 ) ; Britain 1237 ( "WETDST" 0 -1 ) ( "WET" 0 0 )
1238 ( "NGT" (float 35 -1) "NST" "NDT" ) ; Newfoundland 1238 ( "BGT" 0 "GMT" "BST" ) ( "GMT" 0 0 ) ( "BST" 0 -1 ) ; Britain
1239 ( "NST" (float 35 -1) 0 ) ( "NDT" (float 35 -1) -1 ) 1239 ( "NGT" (float 35 -1) "NST" "NDT" ) ; Newfoundland
1240 ( "AGT" 4 "AST" "ADT" ) ( "AST" 4 0 ) ( "ADT" 4 -1 ) ; Atlantic 1240 ( "NST" (float 35 -1) 0 ) ( "NDT" (float 35 -1) -1 )
1241 ( "EGT" 5 "EST" "EDT" ) ( "EST" 5 0 ) ( "EDT" 5 -1 ) ; Eastern 1241 ( "AGT" 4 "AST" "ADT" ) ( "AST" 4 0 ) ( "ADT" 4 -1 ) ; Atlantic
1242 ( "CGT" 6 "CST" "CDT" ) ( "CST" 6 0 ) ( "CDT" 6 -1 ) ; Central 1242 ( "EGT" 5 "EST" "EDT" ) ( "EST" 5 0 ) ( "EDT" 5 -1 ) ; Eastern
1243 ( "MGT" 7 "MST" "MDT" ) ( "MST" 7 0 ) ( "MDT" 7 -1 ) ; Mountain 1243 ( "CGT" 6 "CST" "CDT" ) ( "CST" 6 0 ) ( "CDT" 6 -1 ) ; Central
1244 ( "PGT" 8 "PST" "PDT" ) ( "PST" 8 0 ) ( "PDT" 8 -1 ) ; Pacific 1244 ( "MGT" 7 "MST" "MDT" ) ( "MST" 7 0 ) ( "MDT" 7 -1 ) ; Mountain
1245 ( "YGT" 9 "YST" "YDT" ) ( "YST" 9 0 ) ( "YDT" 9 -1 ) ; Yukon 1245 ( "PGT" 8 "PST" "PDT" ) ( "PST" 8 0 ) ( "PDT" 8 -1 ) ; Pacific
1246)) 1246 ( "YGT" 9 "YST" "YDT" ) ( "YST" 9 0 ) ( "YDT" 9 -1 ) ; Yukon
1247 )
1248 "No doc yet. See calc manual for now. ")
1247 1249
1248 1250
1249(defun math-daylight-savings-adjust (date zone &optional dt) 1251(defun math-daylight-savings-adjust (date zone &optional dt)