diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-03-14 12:07:06 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-03-14 12:07:06 +0100 |
| commit | e75d2031bc889a346be8109db4690034b007d3ab (patch) | |
| tree | 0da20ae3620a9a607fe4ae84e90a7fe19f5e55bd | |
| parent | 07347025ee204b76d372a5cd62a37d5a5feb0472 (diff) | |
| parent | 62d759e3c941898ccf36569321b21a987281ffeb (diff) | |
| download | org-mode-e75d2031bc889a346be8109db4690034b007d3ab.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 1 | ||||
| -rw-r--r-- | lisp/org-timer.el | 3 | ||||
| -rw-r--r-- | lisp/org.el | 17 |
3 files changed, 12 insertions, 9 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 136a3b8..65a110d 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6251,6 +6251,7 @@ an hour specification like [h]h:mm." category-pos (get-text-property (point) 'org-category-position)) (if (and (eq org-agenda-skip-scheduled-if-deadline-is-shown 'repeated-after-deadline) + (org-get-deadline-time (point)) (<= 0 (- d2 (time-to-days (org-get-deadline-time (point)))))) (throw :skip nil)) (if (not (re-search-backward "^\\*+[ \t]+" nil t)) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 5554027..3f52260 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -161,7 +161,8 @@ With prefix arg STOP, stop it entirely." (interactive) (run-hooks 'org-timer-stop-hook) (setq org-timer-start-time nil - org-timer-pause-time nil) + org-timer-pause-time nil + org-timer-current-timer nil) (org-timer-set-mode-line 'off) (message "Timer stopped")) diff --git a/lisp/org.el b/lisp/org.el index 74a0ef0..cbcc7f9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -15550,14 +15550,15 @@ However, if LITERAL-NIL is set, return the string value \"nil\" instead." (save-restriction (widen) (catch 'ex - (while t - (when (setq tmp (org-entry-get nil property nil 'literal-nil)) - (or (ignore-errors (org-back-to-heading t)) - (goto-char (point-min))) - (move-marker org-entry-property-inherited-from (point)) - (throw 'ex tmp)) - (or (ignore-errors (org-up-heading-safe)) - (throw 'ex nil)))))) + (let (org-file-properties org-global-properties org-global-properties-fixed) + (while t + (when (setq tmp (org-entry-get nil property nil 'literal-nil)) + (or (ignore-errors (org-back-to-heading t)) + (goto-char (point-min))) + (move-marker org-entry-property-inherited-from (point)) + (throw 'ex tmp)) + (or (ignore-errors (org-up-heading-safe)) + (throw 'ex nil))))))) (setq tmp (or tmp (cdr (assoc property org-file-properties)) (cdr (assoc property org-global-properties)) |