ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2015-08-17 20:43:03 +02:00
parent 40b4ef3345 a03cd64994
commit af7ea548b0
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/org.el
View File

@ -17481,12 +17481,13 @@ both scheduled and deadline timestamps."
(regexp (org-re-timestamp org-ts-type)) (regexp (org-re-timestamp org-ts-type))
(callback (callback
`(lambda () `(lambda ()
(and ,(if (memq org-ts-type '(active inactive all)) (let ((match (match-string 1)))
'(eq (org-element-type (org-element-context)) 'timestamp) (and ,(if (memq org-ts-type '(active inactive all))
'(org-at-planning-p)) '(eq (org-element-type (org-element-context)) 'timestamp)
(time-less-p '(org-at-planning-p))
(org-time-string-to-time (match-string 1)) (time-less-p
(org-time-string-to-time date)))))) (org-time-string-to-time match)
(org-time-string-to-time date)))))))
(message "%d entries before %s" (message "%d entries before %s"
(org-occur regexp nil callback) date))) (org-occur regexp nil callback) date)))
@ -17497,12 +17498,13 @@ both scheduled and deadline timestamps."
(regexp (org-re-timestamp org-ts-type)) (regexp (org-re-timestamp org-ts-type))
(callback (callback
`(lambda () `(lambda ()
(and ,(if (memq org-ts-type '(active inactive all)) (let ((match (match-string 1)))
'(eq (org-element-type (org-element-context)) 'timestamp) (and ,(if (memq org-ts-type '(active inactive all))
'(org-at-planning-p)) '(eq (org-element-type (org-element-context)) 'timestamp)
(not (time-less-p '(org-at-planning-p))
(org-time-string-to-time (match-string 1)) (not (time-less-p
(org-time-string-to-time date))))))) (org-time-string-to-time match)
(org-time-string-to-time date))))))))
(message "%d entries after %s" (message "%d entries after %s"
(org-occur regexp nil callback) date))) (org-occur regexp nil callback) date)))