Merge branch 'maint'

lisp/org-colview.el

@@ -146,6 +146,11 @@ This is the compiled version of the format.")
     "--"
     ["Quit" org-columns-quit t]))
 
+(defun org-columns--value (property pos)
+  "Return value for PROPERTY at buffer position POS"
+  (or (cdr (assoc-string property (get-text-property pos 'org-summaries) t))
+      (org-entry-get pos property 'selective t)))
+
 (defun org-columns-new-overlay (beg end &optional string face)
   "Create a new column overlay and add it to the list."
   (let ((ov (make-overlay beg end)))
@@ -710,10 +715,9 @@ When COLUMNS-FMT-STRING is non-nil, use it as the column format."
 	      (org-map-entries
 	       (lambda ()
 		 (cons (point)
-		       (mapcar
+		       (mapcar (lambda (p)
-			(lambda (p)
+				 (cons p (org-columns--value p (point))))
-			  (cons p (org-entry-get nil p 'selective t)))
+			       column-names)))
-			column-names)))
 	       nil nil (and org-columns-skip-archived-trees 'archive))))
 	(when cache
 	  (org-set-local 'org-columns-current-maxwidths
@@ -1410,7 +1414,7 @@ and tailing newline characters."
 		(org-with-point-at m
 		  (mapcar
 		   (lambda (name)
-		     (let ((value (org-entry-get (point) name 'selective t)))
+		     (let ((value (org-columns--value name (point))))
 		       (cons
 			name
 			(if (and org-agenda-columns-add-appointments-to-effort-sum

lisp/org.el

@@ -15861,7 +15861,7 @@ strings."
 	    (push (cons "CATEGORY" (org-get-category beg)) props)
 	    (when (string= specific "CATEGORY") (throw 'exit props)))
 	  ;; Return value.
-	  (append (get-text-property beg 'org-summaries) props))))))
+	  props)))))
 
 (defun org-property--local-values (property literal-nil)
   "Return value for PROPERTY in current entry.