diff options
author | Bastien Guerry <bzg@altern.org> | 2014-02-11 15:39:23 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-02-11 15:39:23 +0100 |
commit | bd0f9b8052036f9733adc6511f721a7d20f3215d (patch) | |
tree | 75e7f23f44e0113a30a8e73f5c685f83306d38c7 | |
parent | 5edf83c69420babb62e25e2f9e925d656706bb79 (diff) | |
parent | b84559f422711034858e508d9ee6e594f97920e0 (diff) | |
download | org-mode-bd0f9b8052036f9733adc6511f721a7d20f3215d.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-colview.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org-colview.el b/lisp/org-colview.el index c4f49a0..805882d 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -174,7 +174,7 @@ This is the compiled version of the format.") (face (list color font 'org-column ref-face)) (face1 (list color font 'org-agenda-column-dateline ref-face)) (cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp)) - pom property ass width f string ov column val modval s2 title calc) + pom property ass width f fc string ov column val modval s2 title calc) ;; Check if the entry is in another buffer. (unless props (if (eq major-mode 'org-agenda-mode) @@ -204,6 +204,8 @@ This is the compiled version of the format.") (nth 2 column) (length property)) f (format "%%-%d.%ds | " width width) + fm (nth 4 column) + fc (nth 5 column) calc (nth 7 column) val (or (cdr ass) "") modval (cond ((and org-columns-modify-value-for-display-function @@ -215,13 +217,14 @@ This is the compiled version of the format.") (org-columns-cleanup-item val org-columns-current-fmt-compiled (or org-complex-heading-regexp cphr))) + (fc (org-columns-number-to-string + (org-columns-string-to-number val fm) fm fc)) ((and calc (functionp calc) (not (string= val "")) (not (get-text-property 0 'org-computed val))) (org-columns-number-to-string (funcall calc (org-columns-string-to-number - val (nth 4 column))) - (nth 4 column))))) + val fm)) fm)))) (setq s2 (org-columns-add-ellipses (or modval val) width)) (setq string (format f s2)) ;; Create the overlay |