diff options
author | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
commit | 30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa (patch) | |
tree | 782f2f5767065ad571bf5b82a162da96064cf22a /lisp/org/org-colview.el | |
parent | d5ff4ded7a225306017006fc96b0a30180ae6f6b (diff) | |
download | emacs-30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa.tar.gz |
Merge Org 8.2.6-1.
The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.
Diffstat (limited to 'lisp/org/org-colview.el')
-rw-r--r-- | lisp/org/org-colview.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el index 9dd0340a233..07ee69f14c5 100644 --- a/lisp/org/org-colview.el +++ b/lisp/org/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 fm 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 |