Browse Source

Revert "Time specifications: Allow specifying relative times"

This reverts commit 001bcb9645bf0a5ea72f09ae502a8410319473c0.
Bastien Guerry 13 years ago
parent
commit
6f78edd68c
1 changed files with 10 additions and 13 deletions
  1. 10 13
      lisp/org.el

+ 10 - 13
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)