diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-04-20 14:23:06 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-04-20 14:23:06 +0200 |
| commit | 6f78edd68c78ff1cf5d85c3fa337ca4c048389a8 (patch) | |
| tree | 5fa07127d594e36bb06aa75fb24ea49941f52dcb | |
| parent | e449f12d6f26e972c519ec2e8693bb9cb5a224d5 (diff) | |
| download | org-mode-6f78edd68c78ff1cf5d85c3fa337ca4c048389a8.tar.gz | |
Revert "Time specifications: Allow specifying relative times"
This reverts commit 001bcb9645bf0a5ea72f09ae502a8410319473c0.
| -rw-r--r-- | lisp/org.el | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/lisp/org.el b/lisp/org.el index 54ca285..b2b140c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16019,19 +16019,16 @@ When SHOW-ALL is nil, only return the current occurrence of a time stamp." This should be a lot faster than the normal `parse-time-string'. If time is not given, defaults to 0:00. However, with optional NODEFAULT, hour and minute fields will be nil if not given." - (cond - ((string-match "^<.+>$" s) - (decode-time (seconds-to-time (org-matcher-time s)))) - ((string-match org-ts-regexp0 s) - (list 0 - (if (or (match-beginning 8) (not nodefault)) - (string-to-number (or (match-string 8 s) "0"))) - (if (or (match-beginning 7) (not nodefault)) - (string-to-number (or (match-string 7 s) "0"))) - (string-to-number (match-string 4 s)) - (string-to-number (match-string 3 s)) - (string-to-number (match-string 2 s)) - nil nil nil)) + (if (string-match org-ts-regexp0 s) + (list 0 + (if (or (match-beginning 8) (not nodefault)) + (string-to-number (or (match-string 8 s) "0"))) + (if (or (match-beginning 7) (not nodefault)) + (string-to-number (or (match-string 7 s) "0"))) + (string-to-number (match-string 4 s)) + (string-to-number (match-string 3 s)) + (string-to-number (match-string 2 s)) + nil nil nil) (error "Not a standard Org-mode time string: %s" s))) (defun org-timestamp-up (&optional arg) |