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-18 11:53:54 +02:00
parent af7ea548b0 682bb962f3
commit 34c458929a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org.el
View File

@ -13921,6 +13921,7 @@ that the match should indeed be shown."
;; hide everything ;; hide everything
(org-overview)) (org-overview))
(while (re-search-forward regexp nil t) (while (re-search-forward regexp nil t)
(backward-char) ;; FIXME: Match timestamps at the end of a headline
(when (or (not callback) (when (or (not callback)
(save-match-data (funcall callback))) (save-match-data (funcall callback)))
(setq cnt (1+ cnt)) (setq cnt (1+ cnt))
@ -17444,7 +17445,6 @@ days. If the prefix is a raw \\[universal-argument] prefix, all deadlines are s
(regexp (concat "\\<" org-deadline-string " *<\\([^>]+\\)>")) (regexp (concat "\\<" org-deadline-string " *<\\([^>]+\\)>"))
(callback (callback
(lambda () (org-deadline-close (match-string 1) org-warn-days)))) (lambda () (org-deadline-close (match-string 1) org-warn-days))))
(message "%d deadlines past-due or due within %d days" (message "%d deadlines past-due or due within %d days"
(org-occur regexp nil callback) (org-occur regexp nil callback)
org-warn-days))) org-warn-days)))