Merge branch 'maint' into wip
This commit is contained in:
commit
8fd176ee76
|
@ -186,7 +186,8 @@ variables and values specified in props"
|
||||||
(header-props
|
(header-props
|
||||||
(mapcar (lambda (props)
|
(mapcar (lambda (props)
|
||||||
(mapcar (lambda (pair)
|
(mapcar (lambda (pair)
|
||||||
(cons (car pair) (org-babel-read (cdr pair))))
|
(let ((inhibit-lisp-eval (string= (car pair) "ITEM")))
|
||||||
|
(cons (car pair) (org-babel-read (cdr pair) inhibit-lisp-eval))))
|
||||||
props))
|
props))
|
||||||
header-props))
|
header-props))
|
||||||
;; collect all property names
|
;; collect all property names
|
||||||
|
|
|
@ -4500,9 +4500,9 @@ is active."
|
||||||
(setq files (org-agenda-files nil 'ifmode))
|
(setq files (org-agenda-files nil 'ifmode))
|
||||||
;; Add `org-agenda-text-search-extra-files' unless there is some
|
;; Add `org-agenda-text-search-extra-files' unless there is some
|
||||||
;; restriction.
|
;; restriction.
|
||||||
(unless (get 'org-agenda-files 'org-restrict)
|
(when (eq (car org-agenda-text-search-extra-files) 'agenda-archives)
|
||||||
(when (eq (car org-agenda-text-search-extra-files) 'agenda-archives)
|
(pop org-agenda-text-search-extra-files)
|
||||||
(pop org-agenda-text-search-extra-files)
|
(unless (get 'org-agenda-files 'org-restrict)
|
||||||
(setq files (org-add-archive-files files))))
|
(setq files (org-add-archive-files files))))
|
||||||
;; Uniquify files. However, let `org-check-agenda-file' handle
|
;; Uniquify files. However, let `org-check-agenda-file' handle
|
||||||
;; non-existent ones.
|
;; non-existent ones.
|
||||||
|
@ -4763,11 +4763,11 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
|
||||||
(format "*Org Agenda(%s:%s)*"
|
(format "*Org Agenda(%s:%s)*"
|
||||||
(or org-keys (or (and todo-only "M") "m")) match)
|
(or org-keys (or (and todo-only "M") "m")) match)
|
||||||
(format "*Org Agenda(%s)*" (or (and todo-only "M") "m")))))
|
(format "*Org Agenda(%s)*" (or (and todo-only "M") "m")))))
|
||||||
|
(setq matcher (org-make-tags-matcher match))
|
||||||
;; Prepare agendas (and `org-tag-alist-for-agenda') before
|
;; Prepare agendas (and `org-tag-alist-for-agenda') before
|
||||||
;; expanding tags within `org-make-tags-matcher'
|
;; expanding tags within `org-make-tags-matcher'
|
||||||
(org-agenda-prepare (concat "TAGS " match))
|
(org-agenda-prepare (concat "TAGS " match))
|
||||||
(setq matcher (org-make-tags-matcher match)
|
(setq match (car matcher)
|
||||||
match (car matcher)
|
|
||||||
matcher (cdr matcher))
|
matcher (cdr matcher))
|
||||||
(org-compile-prefix-format 'tags)
|
(org-compile-prefix-format 'tags)
|
||||||
(org-set-sorting-strategy 'tags)
|
(org-set-sorting-strategy 'tags)
|
||||||
|
@ -6001,29 +6001,24 @@ specification like [h]h:mm."
|
||||||
(org-agenda--timestamp-to-absolute
|
(org-agenda--timestamp-to-absolute
|
||||||
s base 'future (current-buffer) pos)))))
|
s base 'future (current-buffer) pos)))))
|
||||||
(diff (- deadline current))
|
(diff (- deadline current))
|
||||||
(suppress-prewarning
|
(wdays
|
||||||
(let ((scheduled
|
(cond
|
||||||
(and org-agenda-skip-deadline-prewarning-if-scheduled
|
;; The current item has a scheduled date, so
|
||||||
(org-entry-get nil "SCHEDULED"))))
|
;; evaluate its prewarning lead time.
|
||||||
(cond
|
((integerp org-agenda-skip-deadline-prewarning-if-scheduled)
|
||||||
((not scheduled) nil)
|
;; Use global prewarning-restart lead time.
|
||||||
;; The current item has a scheduled date, so
|
org-agenda-skip-deadline-prewarning-if-scheduled)
|
||||||
;; evaluate its prewarning lead time.
|
((eq org-agenda-skip-deadline-prewarning-if-scheduled
|
||||||
((integerp org-agenda-skip-deadline-prewarning-if-scheduled)
|
'pre-scheduled)
|
||||||
;; Use global prewarning-restart lead time.
|
;; Set pre-warning to no earlier than SCHEDULED.
|
||||||
org-agenda-skip-deadline-prewarning-if-scheduled)
|
(min (- deadline
|
||||||
((eq org-agenda-skip-deadline-prewarning-if-scheduled
|
(org-agenda--timestamp-to-absolute
|
||||||
'pre-scheduled)
|
(org-entry-get nil "SCHEDULED")))
|
||||||
;; Set pre-warning to no earlier than SCHEDULED.
|
org-deadline-warning-days))
|
||||||
(min (- deadline
|
;; Set pre-warning to 0
|
||||||
(org-agenda--timestamp-to-absolute scheduled))
|
(org-agenda-skip-deadline-prewarning-if-scheduled 0)
|
||||||
org-deadline-warning-days))
|
;; Set pre-warning to deadline.
|
||||||
;; Set pre-warning to deadline.
|
(t (org-get-wdays s)))))
|
||||||
(t 0))))
|
|
||||||
(wdays (if suppress-prewarning
|
|
||||||
(let ((org-deadline-warning-days suppress-prewarning))
|
|
||||||
(org-get-wdays s))
|
|
||||||
(org-get-wdays s))))
|
|
||||||
(cond
|
(cond
|
||||||
;; Only display deadlines at their base date, at future
|
;; Only display deadlines at their base date, at future
|
||||||
;; repeat occurrences or in today agenda.
|
;; repeat occurrences or in today agenda.
|
||||||
|
|
|
@ -320,7 +320,8 @@ the ATTACH_DIR property) their own attachment directory."
|
||||||
(defun org-attach-annex-get-maybe (path)
|
(defun org-attach-annex-get-maybe (path)
|
||||||
"Call git annex get PATH (via shell) if using git annex.
|
"Call git annex get PATH (via shell) if using git annex.
|
||||||
Signals an error if the file content is not available and it was not retrieved."
|
Signals an error if the file content is not available and it was not retrieved."
|
||||||
(let ((path-relative (file-relative-name path)))
|
(let* ((default-directory (expand-file-name org-attach-directory))
|
||||||
|
(path-relative (file-relative-name path)))
|
||||||
(when (and (org-attach-use-annex)
|
(when (and (org-attach-use-annex)
|
||||||
(not
|
(not
|
||||||
(string-equal
|
(string-equal
|
||||||
|
|
|
@ -9982,7 +9982,7 @@ Raise a user error when there is nothing to follow."
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(let ((org-inhibit-startup (not reference-buffer)))
|
(let ((org-inhibit-startup (not reference-buffer)))
|
||||||
(org-mode)
|
(org-mode)
|
||||||
(insert s)
|
(insert (org-link-escape s))
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(when reference-buffer
|
(when reference-buffer
|
||||||
(setq org-link-abbrev-alist-local
|
(setq org-link-abbrev-alist-local
|
||||||
|
|
Loading…
Reference in New Issue