Merge from emacs-24; up to 2012-12-03T21:07:47Z!eggert@cs.ucla.edu

[gnu-emacs] / lisp / calc / calc.el

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 58eabf9bcec03a8288544759a9530370ad74892f..517161a616d860ccd3f727b252f34d0e9bb96b58 100644 (file)
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -787,7 +787,9 @@ If nil, selections displayed but ignored.")
     "M-D-Y< H:mm:SSpp>"
     "D-M-Y< h:mm:SS>"
     "j<, h:mm:SS>"
-    "YYddd< hh:mm:ss>"))
+    "YYddd< hh:mm:ss>"
+    "ZYYY-MM-DD Www< hh:mm>"
+    "IYYY-Iww-w<Thh:mm:ss>"))
 
 (defcalcmodevar calc-autorange-units nil
   "If non-nil, automatically set unit prefixes to keep units in a reasonable range.")