[elpa] externals/org b07a31c: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit b07a31cbd74d241a3773e16df089efcae4f292d7
Merge: f63bb5e 5469bc4
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org-colview.el | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index d80fa8e..517bcdf 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -1165,14 +1165,13 @@ properties drawers."
         (last-level lmax)
         (property (car spec))
         (printf (nth 4 spec))
-        (operator (nth 3 spec))
+         ;; Special properties cannot be collected nor summarized, as
+         ;; they have their own way to be computed.  Therefore, ignore
+         ;; any operator attached to them.
+        (operator (and (not (member property org-special-properties))
+                        (nth 3 spec)))
         (collect (and operator (org-columns--collect operator)))
-        (summarize (and operator (org-columns--summarize operator)))
-         ;; Special properties are not set in a property drawer, and
-         ;; therefore should not be updated.
-         (update
-          (and update
-               (not (member property org-special-properties)))))
+        (summarize (and operator (org-columns--summarize operator))))
     (org-with-wide-buffer
      ;; Find the region to compute.
      (goto-char org-columns-top-level-marker)