|
@@ -323,7 +323,7 @@ This is the compiled version of the format.")
|
|
|
(face (if (featurep 'xemacs) color (list color 'org-column)))
|
|
|
(pl (or (get-text-property (point-at-bol) 'prefix-length) 0))
|
|
|
(cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp))
|
|
|
- pom property ass width f string ov column val modval s1 s2)
|
|
|
+ pom property ass width f string ov column val modval s1 s2 title)
|
|
|
;; Check if the entry is in another buffer.
|
|
|
(unless props
|
|
|
(if (eq major-mode 'org-agenda-mode)
|
|
@@ -334,6 +334,7 @@ This is the compiled version of the format.")
|
|
|
;; Walk the format
|
|
|
(while (setq column (pop fmt))
|
|
|
(setq property (car column)
|
|
|
+ title (nth 1 column)
|
|
|
ass (if (equal property "ITEM")
|
|
|
(cons "ITEM" item)
|
|
|
(assoc property props))
|
|
@@ -343,12 +344,18 @@ This is the compiled version of the format.")
|
|
|
f (format (if (featurep 'xemacs) "%%-%d.%ds |" "%%-%d.%ds | ")
|
|
|
width width)
|
|
|
val (or (cdr ass) "")
|
|
|
- modval (if (equal property "ITEM")
|
|
|
- (if (org-mode-p)
|
|
|
- (org-columns-cleanup-item
|
|
|
- val org-columns-current-fmt-compiled)
|
|
|
- (org-agenda-columns-cleanup-item
|
|
|
- val pl cphr org-columns-current-fmt-compiled))))
|
|
|
+ modval (or (and org-columns-modify-value-for-display-function
|
|
|
+ (functionp
|
|
|
+ org-columns-modify-value-for-display-function)
|
|
|
+ (funcall
|
|
|
+ org-columns-modify-value-for-display-function
|
|
|
+ title val))
|
|
|
+ (if (equal property "ITEM")
|
|
|
+ (if (org-mode-p)
|
|
|
+ (org-columns-cleanup-item
|
|
|
+ val org-columns-current-fmt-compiled)
|
|
|
+ (org-agenda-columns-cleanup-item
|
|
|
+ val pl cphr org-columns-current-fmt-compiled)))))
|
|
|
(setq s2 (org-columns-add-ellipses (or modval val) width))
|
|
|
(setq string (format f s2))
|
|
|
;; Create the overlay
|