|
@@ -13684,10 +13684,14 @@ user."
|
|
|
(unless deltadef
|
|
|
(let ((now (decode-time)))
|
|
|
(setq day (nth 3 now) month (nth 4 now) year (nth 5 now))))
|
|
|
- (cond ((member deltaw '("d" "")) (setq day (+ day deltan)))
|
|
|
- ((equal deltaw "w") (setq day (+ day (* 7 deltan))))
|
|
|
- ((equal deltaw "m") (setq month (+ month deltan)))
|
|
|
- ((equal deltaw "y") (setq year (+ year deltan)))))
|
|
|
+ (cond ((member deltaw '("h" ""))
|
|
|
+ (when (boundp 'org-time-was-given)
|
|
|
+ (setq org-time-was-given t))
|
|
|
+ (setq hour (+ hour deltan)))
|
|
|
+ ((member deltaw '("d" "")) (setq day (+ day deltan)))
|
|
|
+ ((equal deltaw "w") (setq day (+ day (* 7 deltan))))
|
|
|
+ ((equal deltaw "m") (setq month (+ month deltan)))
|
|
|
+ ((equal deltaw "y") (setq year (+ year deltan)))))
|
|
|
((and wday (not (nth 3 tl)))
|
|
|
;; Weekday was given, but no day, so pick that day in the week
|
|
|
;; on or after the derived date.
|