forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
87a00b3595
|
@ -10452,11 +10452,11 @@ environment. This causes the following issues:
|
||||||
the entries in the agenda are collected from different files, and
|
the entries in the agenda are collected from different files, and
|
||||||
different files may have different columns formats, this is
|
different files may have different columns formats, this is
|
||||||
a non-trivial problem. Org first checks if the variable
|
a non-trivial problem. Org first checks if the variable
|
||||||
~org-agenda-overriding-columns-format~ is currently set, and if so,
|
~org-overriding-columns-format~ is currently set, and if so, takes
|
||||||
takes the format from there. Otherwise it takes the format
|
the format from there. Otherwise it takes the format associated
|
||||||
associated with the first item in the agenda, or, if that item does
|
with the first item in the agenda, or, if that item does not have
|
||||||
not have a specific format (defined in a property, or in its file),
|
a specific format (defined in a property, or in its file), it uses
|
||||||
it uses ~org-columns-default-format~.
|
~org-columns-default-format~.
|
||||||
|
|
||||||
2.
|
2.
|
||||||
#+cindex: @samp{CLOCKSUM}, special property
|
#+cindex: @samp{CLOCKSUM}, special property
|
||||||
|
|
|
@ -3767,7 +3767,8 @@ FILTER-ALIST is an alist of filters we need to apply when
|
||||||
(setq-local org-agenda-name name)))
|
(setq-local org-agenda-name name)))
|
||||||
(setq buffer-read-only nil))))
|
(setq buffer-read-only nil))))
|
||||||
|
|
||||||
(defvar org-agenda-overriding-columns-format) ; From org-colview.el
|
(defvar org-overriding-columns-format)
|
||||||
|
(defvar org-local-columns-format)
|
||||||
(defun org-agenda-finalize ()
|
(defun org-agenda-finalize ()
|
||||||
"Finishing touch for the agenda buffer, called just before displaying it."
|
"Finishing touch for the agenda buffer, called just before displaying it."
|
||||||
(unless org-agenda-multi
|
(unless org-agenda-multi
|
||||||
|
@ -3782,9 +3783,9 @@ FILTER-ALIST is an alist of filters we need to apply when
|
||||||
(org-agenda-align-tags))
|
(org-agenda-align-tags))
|
||||||
(unless org-agenda-with-colors
|
(unless org-agenda-with-colors
|
||||||
(remove-text-properties (point-min) (point-max) '(face nil)))
|
(remove-text-properties (point-min) (point-max) '(face nil)))
|
||||||
(when (bound-and-true-p org-agenda-overriding-columns-format)
|
(when (bound-and-true-p org-overriding-columns-format)
|
||||||
(setq-local org-agenda-overriding-columns-format
|
(setq-local org-local-columns-format
|
||||||
org-agenda-overriding-columns-format))
|
org-overriding-columns-format))
|
||||||
(when org-agenda-view-columns-initially
|
(when org-agenda-view-columns-initially
|
||||||
(org-agenda-columns))
|
(org-agenda-columns))
|
||||||
(when org-agenda-fontify-priorities
|
(when org-agenda-fontify-priorities
|
||||||
|
|
|
@ -558,9 +558,15 @@ for the duration of the command.")
|
||||||
(org-columns-next-allowed-value)
|
(org-columns-next-allowed-value)
|
||||||
(org-columns-edit-value "TAGS")))
|
(org-columns-edit-value "TAGS")))
|
||||||
|
|
||||||
(defvar org-agenda-overriding-columns-format nil
|
(defvar org-overriding-columns-format nil
|
||||||
"When set, overrides any other format definition for the agenda.
|
"When set, overrides any other format definition for the agenda.
|
||||||
Don't set this, this is meant for dynamic scoping.")
|
Don't set this, this is meant for dynamic scoping. Set
|
||||||
|
`org-local-columns-format' instead.")
|
||||||
|
|
||||||
|
(defvar-local org-local-columns-format nil
|
||||||
|
"When set, overrides any other format definition for the agenda.
|
||||||
|
This can be set as a buffer local value to avoid interfering with
|
||||||
|
dynamic scoping for `org-overriding-columns-format'.")
|
||||||
|
|
||||||
(defun org-columns-edit-value (&optional key)
|
(defun org-columns-edit-value (&optional key)
|
||||||
"Edit the value of the property at point in column view.
|
"Edit the value of the property at point in column view.
|
||||||
|
@ -621,7 +627,7 @@ Where possible, use the standard interface for changing this line."
|
||||||
(org-columns--call action)
|
(org-columns--call action)
|
||||||
;; The following let preserves the current format, and makes
|
;; The following let preserves the current format, and makes
|
||||||
;; sure that in only a single file things need to be updated.
|
;; sure that in only a single file things need to be updated.
|
||||||
(let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
|
(let* ((org-overriding-columns-format org-columns-current-fmt)
|
||||||
(buffer (marker-buffer pom))
|
(buffer (marker-buffer pom))
|
||||||
(org-agenda-contributing-files
|
(org-agenda-contributing-files
|
||||||
(list (with-current-buffer buffer
|
(list (with-current-buffer buffer
|
||||||
|
@ -715,7 +721,7 @@ an integer, select that value."
|
||||||
(org-columns--call action)
|
(org-columns--call action)
|
||||||
;; The following let preserves the current format, and makes
|
;; The following let preserves the current format, and makes
|
||||||
;; sure that in only a single file things need to be updated.
|
;; sure that in only a single file things need to be updated.
|
||||||
(let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
|
(let* ((org-overriding-columns-format org-columns-current-fmt)
|
||||||
(buffer (marker-buffer pom))
|
(buffer (marker-buffer pom))
|
||||||
(org-agenda-contributing-files
|
(org-agenda-contributing-files
|
||||||
(list (with-current-buffer buffer
|
(list (with-current-buffer buffer
|
||||||
|
@ -1554,7 +1560,8 @@ PARAMS is a property list of parameters:
|
||||||
(let* ((org-columns--time (float-time))
|
(let* ((org-columns--time (float-time))
|
||||||
(fmt
|
(fmt
|
||||||
(cond
|
(cond
|
||||||
((bound-and-true-p org-agenda-overriding-columns-format))
|
((bound-and-true-p org-overriding-columns-format))
|
||||||
|
((bound-and-true-p org-local-columns-format))
|
||||||
((let ((m (org-get-at-bol 'org-hd-marker)))
|
((let ((m (org-get-at-bol 'org-hd-marker)))
|
||||||
(and m
|
(and m
|
||||||
(or (org-entry-get m "COLUMNS" t)
|
(or (org-entry-get m "COLUMNS" t)
|
||||||
|
|
|
@ -444,6 +444,9 @@ use of this function is for the stuck project list."
|
||||||
(define-obsolete-variable-alias 'org-texinfo-def-table-markup
|
(define-obsolete-variable-alias 'org-texinfo-def-table-markup
|
||||||
'org-texinfo-table-default-markup "Org 9.1")
|
'org-texinfo-table-default-markup "Org 9.1")
|
||||||
|
|
||||||
|
(define-obsolete-variable-alias 'org-agenda-overriding-columns-format
|
||||||
|
'org-overriding-columns-format "Org 9.2.2")
|
||||||
|
|
||||||
;; The function was made obsolete by commit 65399674d5 of 2013-02-22.
|
;; The function was made obsolete by commit 65399674d5 of 2013-02-22.
|
||||||
;; This make-obsolete call was added 2016-09-01.
|
;; This make-obsolete call was added 2016-09-01.
|
||||||
(make-obsolete 'org-capture-import-remember-templates
|
(make-obsolete 'org-capture-import-remember-templates
|
||||||
|
|
Loading…
Reference in a new issue