mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:07:54 +00:00
org-colview: Fix length of columns
* lisp/org-colview.el (org-columns-display-here): Do not add star to headlines at the display level... (org-columns): ... but when collecting values, here... (org-agenda-columns): ... and there. Reported-by: Michael Brand <michael.ch.brand@gmail.com> <http://permalink.gmane.org/gmane.emacs.orgmode/104846>
This commit is contained in:
parent
aee808987d
commit
3178fcb90d
|
@ -162,8 +162,7 @@ This is the compiled version of the format.")
|
|||
(interactive)
|
||||
(save-excursion
|
||||
(beginning-of-line)
|
||||
(let* ((level (or (org-current-level) 0))
|
||||
(level-face (and (looking-at "\\(\\**\\)\\(\\* \\)")
|
||||
(let* ((level-face (and (looking-at "\\(\\**\\)\\(\\* \\)")
|
||||
(org-get-level-face 2)))
|
||||
(ref-face (or level-face
|
||||
(and (eq major-mode 'org-agenda-mode)
|
||||
|
@ -212,10 +211,7 @@ This is the compiled version of the format.")
|
|||
((functionp org-columns-modify-value-for-display-function)
|
||||
(funcall org-columns-modify-value-for-display-function
|
||||
title val))
|
||||
((equal property "ITEM")
|
||||
(concat (make-string level ?*)
|
||||
" "
|
||||
(org-columns-compact-links val)))
|
||||
((equal property "ITEM") (org-columns-compact-links val))
|
||||
(fc (org-columns-number-to-string
|
||||
(org-columns-string-to-number val fm) fm fc))
|
||||
((and calc (functionp calc)
|
||||
|
@ -717,8 +713,14 @@ When COLUMNS-FMT-STRING is non-nil, use it as the column format."
|
|||
(org-map-entries
|
||||
(lambda ()
|
||||
(cons (point)
|
||||
(mapcar (lambda (p)
|
||||
(cons p (org-columns--value p (point))))
|
||||
(mapcar
|
||||
(lambda (p)
|
||||
(cons p
|
||||
(let ((v (org-columns--value p (point))))
|
||||
(if (not (equal "ITEM" p)) v
|
||||
(concat (make-string (org-current-level) ?*)
|
||||
" "
|
||||
v)))))
|
||||
column-names)))
|
||||
nil nil (and org-columns-skip-archived-trees 'archive))))
|
||||
(when cache
|
||||
|
@ -1430,20 +1432,25 @@ and tailing newline characters."
|
|||
(let ((value (org-columns--value name (point))))
|
||||
(cons
|
||||
name
|
||||
(if (and org-agenda-columns-add-appointments-to-effort-sum
|
||||
(cond
|
||||
((and org-agenda-columns-add-appointments-to-effort-sum
|
||||
(not value)
|
||||
(eq (compare-strings name nil nil
|
||||
org-effort-property nil nil
|
||||
t)
|
||||
t)
|
||||
;; Effort property is not defined. Try
|
||||
;; to use appointment duration.
|
||||
;; Effort property is not defined. Try ;
|
||||
;; to use appointment duration. ;
|
||||
(get-text-property (point) 'duration))
|
||||
(org-propertize
|
||||
(org-minutes-to-clocksum-string
|
||||
(get-text-property (point) 'duration))
|
||||
'face 'org-warning)
|
||||
value))))
|
||||
'face 'org-warning))
|
||||
((equal "ITEM" name)
|
||||
(concat (make-string (org-current-level) ?*)
|
||||
" "
|
||||
value))
|
||||
(t value)))))
|
||||
names)))
|
||||
cache))
|
||||
(forward-line)))
|
||||
|
|
Loading…
Reference in a new issue