summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2012-12-15 20:52:11 -0600
committerJay Belanger <jay.p.belanger@gmail.com>2012-12-15 20:52:11 -0600
commit70042c646772892b7cced9f670594fb934cc25bb (patch)
tree1ccfb839253bc26eb1ad7b2dfaabca642009e375
parentb9d8175e56d6e6a9acd336863f420bf7cd5a471a (diff)
downloademacs-70042c646772892b7cced9f670594fb934cc25bb.tar.gz
* calc/calc.el (calc-standard-date-formats): Adjust one of the
standard date formats.
-rw-r--r--doc/misc/calc.texi2
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc.el2
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 138ed23eae9..71a90e1a3b3 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -13792,7 +13792,7 @@ command (@pxref{Mode Settings}).
@item 10
@samp{ZYYY-MM-DD Www< hh:mm>} (Org mode format)
@item 11
-@samp{IYYY-Iww-w< Thh:mm:ss>} (ISO-8601 week numbering format)
+@samp{IYYY-Iww-w<Thh:mm:ss>} (ISO-8601 week numbering format)
@end table
@node Truncating the Stack, Justification, Date Formats, Display Modes
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c441af4bf5..24718e1af02 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-16 Jay Belanger <jay.p.belanger@gmail.com>
+
+ * calc/calc.el (calc-standard-date-formats): Adjust one of the
+ standard date formats.
+
2012-12-15 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-mode-map): Bind `C-x 8 RET' to
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index b89cfbbda36..517161a616d 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -789,7 +789,7 @@ If nil, selections displayed but ignored.")
"j<, h:mm:SS>"
"YYddd< hh:mm:ss>"
"ZYYY-MM-DD Www< hh:mm>"
- "IYYY-Iww-w< Thh:mm:ss>"))
+ "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.")