Merge branch 'maint'

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))

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"))
 

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))