aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
authorPaul Eggert2019-08-16 22:09:04 -0700
committerPaul Eggert2019-08-16 23:25:07 -0700
commit37257d6acadff17bd1e52cfa460950bcb684c5c3 (patch)
treeab7088cfa725561c8456f388cff79466948b3532 /lisp/org
parentd7c9ed8445d13de7350be3360d68717362f89929 (diff)
downloademacs-37257d6acadff17bd1e52cfa460950bcb684c5c3.tar.gz
emacs-37257d6acadff17bd1e52cfa460950bcb684c5c3.zip
More-compatible subsecond calendrical timestamps
Instead of appending a subseconds member to the result of ‘decode-time’, this keeps the format unchanged unless you give a new optional argument to ‘decode-time’. Also, the augmented format now puts the subsecond info in the SECONDS element, so the total number of elements is unchanged; this is more compatible with code that expects the traditional 9 elements, such as ‘(pcase decoded-time (`(,SEC ,MIN ,HOUR ,DAY ,MON ,YEAR ,DOW ,DST ,ZONE) ...) ...)’. * doc/lispref/os.texi, doc/misc/emacs-mime.texi, etc/NEWS: * lisp/net/soap-client.el (soap-decode-date-time): * lisp/simple.el (decoded-time): Document the new behavior. * lisp/calendar/icalendar.el (icalendar--decode-isodatetime): * lisp/calendar/iso8601.el (iso8601-parse) (iso8601-parse-time, iso8601-parse-duration) (iso8601--decoded-time): * lisp/calendar/parse-time.el (parse-time-string): * lisp/calendar/time-date.el (decoded-time-add) (decoded-time--alter-second): * lisp/org/org.el (org-parse-time-string): * lisp/simple.el (decoded-time): * src/timefns.c (Fdecode_time, Fencode_time): * test/lisp/calendar/icalendar-tests.el: (icalendar--decode-isodatetime): * test/lisp/calendar/iso8601-tests.el (test-iso8601-date-years) (test-iso8601-date-dates, test-iso8601-date-obsolete) (test-iso8601-date-weeks, test-iso8601-date-ordinals) (test-iso8601-time, test-iso8601-combined) (test-iso8601-duration, test-iso8601-intervals) (standard-test-dates, standard-test-time-of-day-fractions) (standard-test-time-of-day-beginning-of-day) (standard-test-time-of-day-utc) (standard-test-time-of-day-zone) (standard-test-date-and-time-of-day, standard-test-interval): * test/lisp/calendar/parse-time-tests.el (parse-time-tests): * test/src/timefns-tests.el (format-time-string-with-zone) (encode-time-dst-numeric-zone): Revert recent changes that added a SUBSECS member to calendrical timestamps, since that component is no longer present (the info, if any, is now in the SECONDS member). * lisp/calendar/time-date.el (decoded-time-add) (decoded-time--alter-second): Support fractional seconds in the new form. Simplify. * src/timefns.c (Fdecode_time): Support new arg FORM. (Fencode_time): Support subsecond resolution. * test/src/timefns-tests.el (format-time-string-with-zone) (decode-then-encode-time): Test subsecond calendrical timestamps.
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/org.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 336c413c8c7..ab29353ae89 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -17775,12 +17775,14 @@ NODEFAULT, hour and minute fields will be nil if not given."
17775 (string-to-number (match-string 4 s)) 17775 (string-to-number (match-string 4 s))
17776 (string-to-number (match-string 3 s)) 17776 (string-to-number (match-string 3 s))
17777 (string-to-number (match-string 2 s)) 17777 (string-to-number (match-string 2 s))
17778 nil nil nil 0)) 17778 nil nil nil))
17779 ((string-match "^<[^>]+>$" s) 17779 ((string-match "^<[^>]+>$" s)
17780 ;; FIXME: `decode-time' needs to be called with ZONE as its 17780 ;; FIXME: `decode-time' needs to be called with ZONE as its
17781 ;; second argument. However, this requires at least Emacs 17781 ;; second argument. However, this requires at least Emacs
17782 ;; 25.1. We can do it when we switch to this version as our 17782 ;; 25.1. We can do it when we switch to this version as our
17783 ;; minimal requirement. 17783 ;; minimal requirement.
17784 ;; FIXME: decode-time needs to be called with t as its
17785 ;; third argument, but this requires at least Emacs 27.
17784 (decode-time (org-matcher-time s))) 17786 (decode-time (org-matcher-time s)))
17785 (t (error "Not a standard Org time string: %s" s)))) 17787 (t (error "Not a standard Org time string: %s" s))))
17786 17788