Переглянути джерело

org-agenda: Fix "Wrong type argument: number-or-marker-p"

* lisp/org-agenda.el (org-agenda-get-deadlines):
(org-agenda-get-scheduled): Make sure deadline and schedule are
a number and not a string.

Reported-by: Jeffrey DeLeo <JeffreyDeLeo@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/110837>
Nicolas Goaziou 8 роки тому
батько
коміт
a1f516f8a5
1 змінених файлів з 7 додано та 5 видалено
  1. 7 5
      lisp/org-agenda.el

+ 7 - 5
lisp/org-agenda.el

@@ -6098,7 +6098,9 @@ specification like [h]h:mm."
 		   ((eq org-agenda-skip-deadline-prewarning-if-scheduled
 			'pre-scheduled)
 		    ;; Set pre-warning to no earlier than SCHEDULED.
-		    (min (- deadline scheduled) org-deadline-warning-days))
+		    (min (- deadline
+			    (org-agenda--timestamp-to-absolute scheduled))
+			 org-deadline-warning-days))
 		   ;; Set pre-warning to deadline.
 		   (t 0))))
 	       (wdays (if suppress-prewarning
@@ -6265,10 +6267,10 @@ scheduled items with an hour specification like [h]h:mm."
 		    (- org-agenda-skip-scheduled-delay-if-deadline))
 		   ((eq org-agenda-skip-scheduled-delay-if-deadline
 			'post-deadline)
-		    ;; Set delay to no later than DEADLINE.  If
-		    ;; DEADLINE has a repeater, compare last schedule
-		    ;; repeat and last deadline repeat.
-		    (min (- schedule deadline) org-scheduled-delay-days))
+		    ;; Set delay to no later than DEADLINE.
+		    (min (- schedule
+			    (org-agenda--timestamp-to-absolute deadline))
+			 org-scheduled-delay-days))
 		   (t 0))))
 	       (ddays
 		(cond