| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096109710981099110011011102110311041105110611071108110911101111111211131114111511161117111811191120112111221123112411251126112711281129113011311132113311341135113611371138113911401141114211431144114511461147114811491150115111521153115411551156115711581159116011611162116311641165116611671168116911701171117211731174117511761177117811791180118111821183118411851186118711881189119011911192119311941195119611971198119912001201120212031204120512061207120812091210121112121213121412151216121712181219122012211222122312241225122612271228122912301231123212331234123512361237123812391240124112421243124412451246124712481249125012511252125312541255125612571258125912601261126212631264126512661267126812691270127112721273127412751276127712781279128012811282128312841285128612871288128912901291129212931294129512961297129812991300130113021303130413051306130713081309131013111312131313141315131613171318131913201321132213231324132513261327132813291330133113321333133413351336133713381339134013411342134313441345134613471348134913501351135213531354135513561357135813591360136113621363136413651366136713681369137013711372137313741375137613771378137913801381138213831384138513861387138813891390139113921393139413951396139713981399140014011402140314041405140614071408140914101411141214131414141514161417141814191420142114221423142414251426142714281429143014311432143314341435143614371438143914401441144214431444144514461447144814491450145114521453145414551456145714581459146014611462146314641465146614671468146914701471147214731474147514761477147814791480148114821483148414851486148714881489149014911492149314941495149614971498149915001501150215031504150515061507150815091510151115121513151415151516151715181519152015211522152315241525152615271528152915301531 | 
							- ;;; org-colview.el --- Column View in Org-mode
 
- ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 
- ;;   Free Software Foundation, Inc.
 
- ;; Author: Carsten Dominik <carsten at orgmode dot org>
 
- ;; Keywords: outlines, hypermedia, calendar, wp
 
- ;; Homepage: http://orgmode.org
 
- ;; Version: 7.6
 
- ;;
 
- ;; This file is part of GNU Emacs.
 
- ;;
 
- ;; GNU Emacs is free software: you can redistribute it and/or modify
 
- ;; it under the terms of the GNU General Public License as published by
 
- ;; the Free Software Foundation, either version 3 of the License, or
 
- ;; (at your option) any later version.
 
- ;; GNU Emacs is distributed in the hope that it will be useful,
 
- ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
- ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
- ;; GNU General Public License for more details.
 
- ;; You should have received a copy of the GNU General Public License
 
- ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
- ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
- ;;
 
- ;;; Commentary:
 
- ;; This file contains the column view for Org.
 
- ;;; Code:
 
- (eval-when-compile (require 'cl))
 
- (require 'org)
 
- (declare-function org-agenda-redo "org-agenda" ())
 
- (declare-function org-agenda-do-context-action "org-agenda" ())
 
- (when (featurep 'xemacs)
 
-   (error "Do not load this file into XEmacs, use 'org-colview-xemacs.el'."))
 
- ;;; Column View
 
- (defvar org-columns-overlays nil
 
-   "Holds the list of current column overlays.")
 
- (defvar org-columns-current-fmt nil
 
-   "Local variable, holds the currently active column format.")
 
- (make-variable-buffer-local 'org-columns-current-fmt)
 
- (defvar org-columns-current-fmt-compiled nil
 
-   "Local variable, holds the currently active column format.
 
- This is the compiled version of the format.")
 
- (make-variable-buffer-local 'org-columns-current-fmt-compiled)
 
- (defvar org-columns-current-widths nil
 
-   "Loval variable, holds the currently widths of fields.")
 
- (make-variable-buffer-local 'org-columns-current-widths)
 
- (defvar org-columns-current-maxwidths nil
 
-   "Loval variable, holds the currently active maximum column widths.")
 
- (make-variable-buffer-local 'org-columns-current-maxwidths)
 
- (defvar org-columns-begin-marker (make-marker)
 
-   "Points to the position where last a column creation command was called.")
 
- (defvar org-columns-top-level-marker (make-marker)
 
-   "Points to the position where current columns region starts.")
 
- (defvar org-columns-map (make-sparse-keymap)
 
-   "The keymap valid in column display.")
 
- (defun org-columns-content ()
 
-   "Switch to contents view while in columns view."
 
-   (interactive)
 
-   (org-overview)
 
-   (org-content))
 
- (org-defkey org-columns-map "c" 'org-columns-content)
 
- (org-defkey org-columns-map "o" 'org-overview)
 
- (org-defkey org-columns-map "e" 'org-columns-edit-value)
 
- (org-defkey org-columns-map "\C-c\C-t" 'org-columns-todo)
 
- (org-defkey org-columns-map "\C-c\C-c" 'org-columns-set-tags-or-toggle)
 
- (org-defkey org-columns-map "\C-c\C-o" 'org-columns-open-link)
 
- (org-defkey org-columns-map "v" 'org-columns-show-value)
 
- (org-defkey org-columns-map "q" 'org-columns-quit)
 
- (org-defkey org-columns-map "r" 'org-columns-redo)
 
- (org-defkey org-columns-map "g" 'org-columns-redo)
 
- (org-defkey org-columns-map [left] 'backward-char)
 
- (org-defkey org-columns-map "\M-b" 'backward-char)
 
- (org-defkey org-columns-map "a" 'org-columns-edit-allowed)
 
- (org-defkey org-columns-map "s" 'org-columns-edit-attributes)
 
- (org-defkey org-columns-map "\M-f"
 
- 	    (lambda () (interactive) (goto-char (1+ (point)))))
 
- (org-defkey org-columns-map [right]
 
- 	    (lambda () (interactive) (goto-char (1+ (point)))))
 
- (org-defkey org-columns-map [down]
 
- 	    (lambda () (interactive)
 
- 	      (let ((col (current-column)))
 
- 		(beginning-of-line 2)
 
- 		(while (and (org-invisible-p2) (not (eobp)))
 
- 		  (beginning-of-line 2))
 
- 		(move-to-column col)
 
- 		(if (eq major-mode 'org-agenda-mode)
 
- 		    (org-agenda-do-context-action)))))
 
- (org-defkey org-columns-map [up]
 
- 	    (lambda () (interactive)
 
- 	      (let ((col (current-column)))
 
- 		(beginning-of-line 0)
 
- 		(while (and (org-invisible-p2) (not (bobp)))
 
- 		  (beginning-of-line 0))
 
- 		(move-to-column col)
 
- 		(if (eq major-mode 'org-agenda-mode)
 
- 		    (org-agenda-do-context-action)))))
 
- (org-defkey org-columns-map [(shift right)] 'org-columns-next-allowed-value)
 
- (org-defkey org-columns-map "n" 'org-columns-next-allowed-value)
 
- (org-defkey org-columns-map [(shift left)] 'org-columns-previous-allowed-value)
 
- (org-defkey org-columns-map "p" 'org-columns-previous-allowed-value)
 
- (org-defkey org-columns-map "<" 'org-columns-narrow)
 
- (org-defkey org-columns-map ">" 'org-columns-widen)
 
- (org-defkey org-columns-map [(meta right)] 'org-columns-move-right)
 
- (org-defkey org-columns-map [(meta left)] 'org-columns-move-left)
 
- (org-defkey org-columns-map [(shift meta right)] 'org-columns-new)
 
- (org-defkey org-columns-map [(shift meta left)] 'org-columns-delete)
 
- (dotimes (i 10)
 
-   (org-defkey org-columns-map (number-to-string i)
 
- 	      `(lambda () (interactive)
 
- 		 (org-columns-next-allowed-value nil ,i))))
 
- (easy-menu-define org-columns-menu org-columns-map "Org Column Menu"
 
-   '("Column"
 
-     ["Edit property" org-columns-edit-value t]
 
-     ["Next allowed value" org-columns-next-allowed-value t]
 
-     ["Previous allowed value" org-columns-previous-allowed-value t]
 
-     ["Show full value" org-columns-show-value t]
 
-     ["Edit allowed values" org-columns-edit-allowed t]
 
-     "--"
 
-     ["Edit column attributes" org-columns-edit-attributes t]
 
-     ["Increase column width" org-columns-widen t]
 
-     ["Decrease column width" org-columns-narrow t]
 
-     "--"
 
-     ["Move column right" org-columns-move-right t]
 
-     ["Move column left" org-columns-move-left t]
 
-     ["Add column" org-columns-new t]
 
-     ["Delete column" org-columns-delete t]
 
-     "--"
 
-     ["CONTENTS" org-columns-content t]
 
-     ["OVERVIEW" org-overview t]
 
-     ["Refresh columns display" org-columns-redo t]
 
-     "--"
 
-     ["Open link" org-columns-open-link t]
 
-     "--"
 
-     ["Quit" org-columns-quit 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)))
 
-     (overlay-put ov 'face (or face 'secondary-selection))
 
-     (org-overlay-display ov string face)
 
-     (push ov org-columns-overlays)
 
-     ov))
 
- (defun org-columns-display-here (&optional props dateline)
 
-   "Overlay the current line with column display."
 
-   (interactive)
 
-   (let* ((fmt org-columns-current-fmt-compiled)
 
- 	 (beg (point-at-bol))
 
- 	 (level-face (save-excursion
 
- 		       (beginning-of-line 1)
 
- 		       (and (looking-at "\\(\\**\\)\\(\\* \\)")
 
- 			    (org-get-level-face 2))))
 
- 	 (ref-face (or level-face
 
- 		       (and (eq major-mode 'org-agenda-mode)
 
- 			    (get-text-property (point-at-bol) 'face))
 
- 		       'default))
 
- 	 (color (list :foreground (face-attribute ref-face :foreground)))
 
- 	 (face (list color 'org-column ref-face))
 
- 	 (face1 (list color '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)
 
-     ;; Check if the entry is in another buffer.
 
-     (unless props
 
-       (if (eq major-mode 'org-agenda-mode)
 
- 	  (setq pom (or (org-get-at-bol 'org-hd-marker)
 
- 			(org-get-at-bol 'org-marker))
 
- 		props (if pom (org-entry-properties pom) nil))
 
- 	(setq props (org-entry-properties nil))))
 
-     ;; Walk the format
 
-     (while (setq column (pop fmt))
 
-       (setq property (car column)
 
- 	    title (nth 1 column)
 
- 	    ass (if (equal property "ITEM")
 
- 		    (cons "ITEM"
 
- 			  ;; When in a buffer, get the whole line,
 
- 			  ;; we'll clean it later…
 
- 			  (if (org-mode-p)
 
- 			      (save-match-data
 
- 				(org-no-properties
 
- 				 (org-remove-tabs
 
- 				  (buffer-substring-no-properties
 
- 				   (point-at-bol) (point-at-eol)))))
 
- 			    ;; In agenda, just get the `txt' property
 
- 			    (org-no-properties
 
- 			     (org-get-at-bol 'txt))))
 
- 		  (assoc property props))
 
- 	    width (or (cdr (assoc property org-columns-current-maxwidths))
 
- 		      (nth 2 column)
 
- 		      (length property))
 
- 	    f (format "%%-%d.%ds | " width width)
 
- 	    calc (nth 7 column)
 
- 	    val (or (cdr ass) "")
 
- 	    modval (cond ((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))
 
- 			 ((equal property "ITEM")
 
- 			  (if (org-mode-p)
 
- 			      (org-columns-cleanup-item
 
- 			       val org-columns-current-fmt-compiled)))
 
- 			 ((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)))))
 
-       (setq s2 (org-columns-add-ellipses (or modval val) width))
 
-       (setq string (format f s2))
 
-       ;; Create the overlay
 
-       (org-unmodified
 
-        (setq ov (org-columns-new-overlay
 
- 		 beg (setq beg (1+ beg)) string (if dateline face1 face)))
 
-        (overlay-put ov 'keymap org-columns-map)
 
-        (overlay-put ov 'org-columns-key property)
 
-        (overlay-put ov 'org-columns-value (cdr ass))
 
-        (overlay-put ov 'org-columns-value-modified modval)
 
-        (overlay-put ov 'org-columns-pom pom)
 
-        (overlay-put ov 'org-columns-format f)
 
-        (overlay-put ov 'line-prefix "")
 
-        (overlay-put ov 'wrap-prefix ""))
 
-       (if (or (not (char-after beg))
 
- 	      (equal (char-after beg) ?\n))
 
- 	  (let ((inhibit-read-only t))
 
- 	    (save-excursion
 
- 	      (goto-char beg)
 
- 	      (org-unmodified (insert " ")))))) ;; FIXME: add props and remove later?
 
-       ;; Make the rest of the line disappear.
 
-       (org-unmodified
 
-        (setq ov (org-columns-new-overlay beg (point-at-eol)))
 
-        (overlay-put ov 'invisible t)
 
-        (overlay-put ov 'keymap org-columns-map)
 
-        (overlay-put ov 'intangible t)
 
-        (overlay-put ov 'line-prefix "")
 
-        (overlay-put ov 'wrap-prefix "")
 
-        (push ov org-columns-overlays)
 
-        (setq ov (make-overlay (1- (point-at-eol)) (1+ (point-at-eol))))
 
-        (overlay-put ov 'keymap org-columns-map)
 
-        (push ov org-columns-overlays)
 
-        (let ((inhibit-read-only t))
 
- 	 (put-text-property (max (point-min) (1- (point-at-bol)))
 
- 			  (min (point-max) (1+ (point-at-eol)))
 
- 			  'read-only "Type `e' to edit property")))))
 
- (defun org-columns-add-ellipses (string width)
 
-   "Truncate STRING with WIDTH characters, with ellipses."
 
-   (cond
 
-    ((<= (length string) width) string)
 
-    ((<= width (length org-columns-ellipses))
 
-     (substring org-columns-ellipses 0 width))
 
-    (t (concat (substring string 0 (- width (length org-columns-ellipses)))
 
- 	      org-columns-ellipses))))
 
- (defvar org-columns-full-header-line-format nil
 
-   "The full header line format, will be shifted by horizontal scrolling." )
 
- (defvar org-previous-header-line-format nil
 
-   "The header line format before column view was turned on.")
 
- (defvar org-columns-inhibit-recalculation nil
 
-   "Inhibit recomputing of columns on column view startup.")
 
- (defvar org-columns-flyspell-was-active nil
 
-   "Remember the state of `flyspell-mode' before column view.
 
- Flyspell-mode can cause problems in columns view, so it is turned off
 
- for the duration of the command.")
 
- (defvar header-line-format)
 
- (defvar org-columns-previous-hscroll 0)
 
- (defun org-columns-display-here-title ()
 
-   "Overlay the newline before the current line with the table title."
 
-   (interactive)
 
-   (let ((fmt org-columns-current-fmt-compiled)
 
- 	string (title "")
 
- 	property width f column str widths)
 
-     (while (setq column (pop fmt))
 
-       (setq property (car column)
 
- 	    str (or (nth 1 column) property)
 
- 	    width (or (cdr (assoc property org-columns-current-maxwidths))
 
- 		      (nth 2 column)
 
- 		      (length str))
 
- 	    widths (push width widths)
 
- 	    f (format "%%-%d.%ds | " width width)
 
- 	    string (format f str)
 
- 	    title (concat title string)))
 
-     (setq title (concat
 
- 		 (org-add-props " " nil 'display '(space :align-to 0))
 
- 		 ;;(org-add-props title nil 'face '(:weight bold :underline t :inherit default))))
 
- 		 (org-add-props title nil 'face 'org-column-title)))
 
-     (org-set-local 'org-previous-header-line-format header-line-format)
 
-     (org-set-local 'org-columns-current-widths (nreverse widths))
 
-     (setq org-columns-full-header-line-format title)
 
-     (setq org-columns-previous-hscroll -1)
 
- ;    (org-columns-hscoll-title)
 
-     (org-add-hook 'post-command-hook 'org-columns-hscoll-title nil 'local)))
 
- (defun org-columns-hscoll-title ()
 
-   "Set the `header-line-format' so that it scrolls along with the table."
 
-   (sit-for .0001) ; need to force a redisplay to update window-hscroll
 
-   (when (not (= (window-hscroll) org-columns-previous-hscroll))
 
-     (setq header-line-format
 
- 	  (concat (substring org-columns-full-header-line-format 0 1)
 
- 		  (substring org-columns-full-header-line-format
 
- 			     (1+ (window-hscroll))))
 
- 	  org-columns-previous-hscroll (window-hscroll))
 
-     (force-mode-line-update)))
 
- (defvar org-colview-initial-truncate-line-value nil
 
-   "Remember the value of `truncate-lines' across colview.")
 
- (defun org-columns-remove-overlays ()
 
-   "Remove all currently active column overlays."
 
-   (interactive)
 
-   (when (marker-buffer org-columns-begin-marker)
 
-     (with-current-buffer (marker-buffer org-columns-begin-marker)
 
-       (when (local-variable-p 'org-previous-header-line-format)
 
- 	(setq header-line-format org-previous-header-line-format)
 
- 	(kill-local-variable 'org-previous-header-line-format)
 
- 	(remove-hook 'post-command-hook 'org-columns-hscoll-title 'local))
 
-       (move-marker org-columns-begin-marker nil)
 
-       (move-marker org-columns-top-level-marker nil)
 
-       (org-unmodified
 
-        (mapc 'delete-overlay org-columns-overlays)
 
-        (setq org-columns-overlays nil)
 
-        (let ((inhibit-read-only t))
 
- 	 (remove-text-properties (point-min) (point-max) '(read-only t))))
 
-       (when org-columns-flyspell-was-active
 
- 	(flyspell-mode 1))
 
-       (when (local-variable-p 'org-colview-initial-truncate-line-value)
 
- 	(setq truncate-lines org-colview-initial-truncate-line-value)))))
 
- (defun org-columns-cleanup-item (item fmt)
 
-   "Remove from ITEM what is a column in the format FMT."
 
-   (if (not org-complex-heading-regexp)
 
-       item
 
-     (when (string-match org-complex-heading-regexp item)
 
-       (setq item
 
- 	    (concat
 
- 	     (org-add-props (match-string 1 item) nil
 
- 	       'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1))))))
 
- 	     (and (match-end 2) (not (assoc "TODO" fmt)) (concat " " (match-string 2 item)))
 
- 	     (and (match-end 3) (not (assoc "PRIORITY" fmt)) (concat " " (match-string 3 item)))
 
- 	     " " (save-match-data (org-columns-compact-links (match-string 4 item)))
 
- 	     (and (match-end 5) (not (assoc "TAGS" fmt)) (concat " " (match-string 5 item)))))
 
-       (add-text-properties
 
-        0 (1+ (match-end 1))
 
-        (list 'org-whitespace (* 2 (1- (org-reduced-level (- (match-end 1) (match-beginning 1))))))
 
-        item)
 
-       item)))
 
- (defun org-columns-compact-links (s)
 
-   "Replace [[link][desc]] with [desc] or [link]."
 
-   (while (string-match org-bracket-link-regexp s)
 
-     (setq s (replace-match
 
- 	     (concat "[" (match-string (if (match-end 3) 3 1) s) "]")
 
- 	     t t s)))
 
-   s)
 
- (defun org-columns-show-value ()
 
-   "Show the full value of the property."
 
-   (interactive)
 
-   (let ((value (get-char-property (point) 'org-columns-value)))
 
-     (message "Value is: %s" (or value ""))))
 
- (defvar org-agenda-columns-active) ;; defined in org-agenda.el
 
- (defun org-columns-quit ()
 
-   "Remove the column overlays and in this way exit column editing."
 
-   (interactive)
 
-   (org-unmodified
 
-    (org-columns-remove-overlays)
 
-    (let ((inhibit-read-only t))
 
-      (remove-text-properties (point-min) (point-max) '(read-only t))))
 
-   (when (eq major-mode 'org-agenda-mode)
 
-     (setq org-agenda-columns-active nil)
 
-     (message
 
-      "Modification not yet reflected in Agenda buffer, use `r' to refresh")))
 
- (defun org-columns-check-computed ()
 
-   "Check if this column value is computed.
 
- If yes, throw an error indicating that changing it does not make sense."
 
-   (let ((val (get-char-property (point) 'org-columns-value)))
 
-     (when (and (stringp val)
 
- 	       (get-char-property 0 'org-computed val))
 
-       (error "This value is computed from the entry's children"))))
 
- (defun org-columns-todo (&optional arg)
 
-   "Change the TODO state during column view."
 
-   (interactive "P")
 
-   (org-columns-edit-value "TODO"))
 
- (defun org-columns-set-tags-or-toggle (&optional arg)
 
-   "Toggle checkbox at point, or set tags for current headline."
 
-   (interactive "P")
 
-   (if (string-match "\\`\\[[ xX-]\\]\\'"
 
- 		    (get-char-property (point) 'org-columns-value))
 
-       (org-columns-next-allowed-value)
 
-     (org-columns-edit-value "TAGS")))
 
- (defun org-columns-edit-value (&optional key)
 
-   "Edit the value of the property at point in column view.
 
- Where possible, use the standard interface for changing this line."
 
-   (interactive)
 
-   (org-columns-check-computed)
 
-   (let* ((col (current-column))
 
- 	 (key (or key (get-char-property (point) 'org-columns-key)))
 
- 	 (value (get-char-property (point) 'org-columns-value))
 
- 	 (bol (point-at-bol)) (eol (point-at-eol))
 
- 	 (pom (or (get-text-property bol 'org-hd-marker)
 
- 		  (point))) ; keep despite of compiler waring
 
- 	 (line-overlays
 
- 	  (delq nil (mapcar (lambda (x)
 
- 			      (and (eq (overlay-buffer x) (current-buffer))
 
- 				   (>= (overlay-start x) bol)
 
- 				   (<= (overlay-start x) eol)
 
- 				   x))
 
- 			    org-columns-overlays)))
 
- 	 (org-columns-time (time-to-number-of-days (current-time)))
 
- 	 nval eval allowed)
 
-     (cond
 
-      ((equal key "CLOCKSUM")
 
-       (error "This special column cannot be edited"))
 
-      ((equal key "ITEM")
 
-       (setq eval '(org-with-point-at pom
 
- 		    (org-edit-headline))))
 
-      ((equal key "TODO")
 
-       (setq eval '(org-with-point-at
 
- 		   pom
 
- 		   (call-interactively 'org-todo))))
 
-      ((equal key "PRIORITY")
 
-       (setq eval '(org-with-point-at pom
 
- 		    (call-interactively 'org-priority))))
 
-      ((equal key "TAGS")
 
-       (setq eval '(org-with-point-at pom
 
- 		    (let ((org-fast-tag-selection-single-key
 
- 			   (if (eq org-fast-tag-selection-single-key 'expert)
 
- 			       t org-fast-tag-selection-single-key)))
 
- 		      (call-interactively 'org-set-tags)))))
 
-      ((equal key "DEADLINE")
 
-       (setq eval '(org-with-point-at pom
 
- 		    (call-interactively 'org-deadline))))
 
-      ((equal key "SCHEDULED")
 
-       (setq eval '(org-with-point-at pom
 
- 		    (call-interactively 'org-schedule))))
 
-      ((equal key "BEAMER_env")
 
-       (setq eval '(org-with-point-at pom
 
- 		    (call-interactively 'org-beamer-select-environment))))
 
-      (t
 
-       (setq allowed (org-property-get-allowed-values pom key 'table))
 
-       (if allowed
 
- 	  (setq nval (org-icompleting-read
 
- 		      "Value: " allowed nil
 
- 		      (not (get-text-property 0 'org-unrestricted
 
- 					      (caar allowed)))))
 
- 	(setq nval (read-string "Edit: " value)))
 
-       (setq nval (org-trim nval))
 
-       (when (not (equal nval value))
 
- 	(setq eval '(org-entry-put pom key nval)))))
 
-     (when eval
 
-       (cond
 
-        ((equal major-mode 'org-agenda-mode)
 
- 	(org-columns-eval eval)
 
- 	;; The following let preserves the current format, and makes sure
 
- 	;; that in only a single file things need to be upated.
 
- 	(let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
 
- 	       (buffer (marker-buffer pom))
 
- 	       (org-agenda-contributing-files
 
- 		(list (with-current-buffer buffer
 
- 			(buffer-file-name (buffer-base-buffer))))))
 
- 	  (org-agenda-columns)))
 
-        (t
 
- 	(let ((inhibit-read-only t))
 
- 	  (org-unmodified
 
- 	   (remove-text-properties
 
- 	    (max (point-min) (1- bol)) eol '(read-only t)))
 
- 	  (unwind-protect
 
- 	      (progn
 
- 		(setq org-columns-overlays
 
- 		      (org-delete-all line-overlays org-columns-overlays))
 
- 		(mapc 'delete-overlay line-overlays)
 
- 		(org-columns-eval eval))
 
- 	    (org-columns-display-here)))
 
- 	(org-move-to-column col)
 
- 	(if (and (org-mode-p)
 
- 		 (nth 3 (assoc key org-columns-current-fmt-compiled)))
 
- 	    (org-columns-update key)))))))
 
- (defun org-edit-headline () ; FIXME: this is not columns specific.  Make interactive?????  Use from agenda????
 
-   "Edit the current headline, the part without TODO keyword, TAGS."
 
-   (org-back-to-heading)
 
-   (when (looking-at org-todo-line-regexp)
 
-     (let ((pos (point))
 
- 	  (pre (buffer-substring (match-beginning 0) (match-beginning 3)))
 
- 	  (txt (match-string 3))
 
- 	  (post "")
 
- 	  txt2)
 
-       (if (string-match (org-re "[ \t]+:[[:alnum:]:_@#%]+:[ \t]*$") txt)
 
- 	  (setq post (match-string 0 txt)
 
- 		txt (substring txt 0 (match-beginning 0))))
 
-       (setq txt2 (read-string "Edit: " txt))
 
-       (when (not (equal txt txt2))
 
- 	(goto-char pos)
 
- 	(insert pre txt2 post)
 
- 	(delete-region (point) (point-at-eol))
 
- 	(org-set-tags nil t)))))
 
- (defun org-columns-edit-allowed ()
 
-   "Edit the list of allowed values for the current property."
 
-   (interactive)
 
-   (let* ((pom (or (org-get-at-bol 'org-marker)
 
- 		  (org-get-at-bol 'org-hd-marker)
 
- 		  (point)))
 
- 	 (key (get-char-property (point) 'org-columns-key))
 
- 	 (key1 (concat key "_ALL"))
 
- 	 (allowed (org-entry-get pom key1 t))
 
- 	 nval)
 
-     ;; FIXME: Cover editing TODO, TAGS etc in-buffer settings.????
 
-     ;; FIXME: Write back to #+PROPERTY setting if that is needed.
 
-     (setq nval (read-string "Allowed: " allowed))
 
-     (org-entry-put
 
-      (cond ((marker-position org-entry-property-inherited-from)
 
- 	    org-entry-property-inherited-from)
 
- 	   ((marker-position org-columns-top-level-marker)
 
- 	    org-columns-top-level-marker)
 
- 	   (t pom))
 
-      key1 nval)))
 
- (defun org-columns-eval (form)
 
-   (let (hidep)
 
-     (save-excursion
 
-       (beginning-of-line 1)
 
-       ;; `next-line' is needed here, because it skips invisible line.
 
-       (condition-case nil (org-no-warnings (next-line 1)) (error nil))
 
-       (setq hidep (org-on-heading-p 1)))
 
-     (eval form)
 
-     (and hidep (hide-entry))))
 
- (defun org-columns-previous-allowed-value ()
 
-   "Switch to the previous allowed value for this column."
 
-   (interactive)
 
-   (org-columns-next-allowed-value t))
 
- (defun org-columns-next-allowed-value (&optional previous nth)
 
-   "Switch to the next allowed value for this column.
 
- When PREVIOUS is set, go to the previous value.  When NTH is
 
- an integer, select that value."
 
-   (interactive)
 
-   (org-columns-check-computed)
 
-   (let* ((col (current-column))
 
- 	 (key (get-char-property (point) 'org-columns-key))
 
- 	 (value (get-char-property (point) 'org-columns-value))
 
- 	 (bol (point-at-bol)) (eol (point-at-eol))
 
- 	 (pom (or (get-text-property bol 'org-hd-marker)
 
- 		  (point))) ; keep despite of compiler waring
 
- 	 (line-overlays
 
- 	  (delq nil (mapcar (lambda (x)
 
- 			      (and (eq (overlay-buffer x) (current-buffer))
 
- 				   (>= (overlay-start x) bol)
 
- 				   (<= (overlay-start x) eol)
 
- 				   x))
 
- 			    org-columns-overlays)))
 
- 	 (allowed (or (org-property-get-allowed-values pom key)
 
- 		      (and (memq
 
- 			    (nth 4 (assoc key org-columns-current-fmt-compiled))
 
- 			    '(checkbox checkbox-n-of-m checkbox-percent))
 
- 			   '("[ ]" "[X]"))
 
- 		      (org-colview-construct-allowed-dates value)))
 
- 	 nval)
 
-     (when (integerp nth)
 
-       (setq nth (1- nth))
 
-       (if (= nth -1) (setq nth 9)))
 
-     (when (equal key "ITEM")
 
-       (error "Cannot edit item headline from here"))
 
-     (unless (or allowed (member key '("SCHEDULED" "DEADLINE")))
 
-       (error "Allowed values for this property have not been defined"))
 
-     (if (member key '("SCHEDULED" "DEADLINE"))
 
- 	(setq nval (if previous 'earlier 'later))
 
-       (if previous (setq allowed (reverse allowed)))
 
-       (cond
 
-        (nth
 
- 	(setq nval (nth nth allowed))
 
- 	(if (not nval)
 
- 	    (error "There are only %d allowed values for property `%s'"
 
- 		   (length allowed) key)))
 
-        ((member value allowed)
 
- 	(setq nval (or (car (cdr (member value allowed)))
 
- 		       (car allowed)))
 
- 	(if (equal nval value)
 
- 	    (error "Only one allowed value for this property")))
 
-        (t (setq nval (car allowed)))))
 
-     (cond
 
-      ((equal major-mode 'org-agenda-mode)
 
-       (org-columns-eval '(org-entry-put pom key nval))
 
-       ;; The following let preserves the current format, and makes sure
 
-       ;; that in only a single file things need to be upated.
 
-       (let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
 
- 	     (buffer (marker-buffer pom))
 
- 	     (org-agenda-contributing-files
 
- 	      (list (with-current-buffer buffer
 
- 		      (buffer-file-name (buffer-base-buffer))))))
 
- 	(org-agenda-columns)))
 
-      (t
 
-       (let ((inhibit-read-only t))
 
- 	(remove-text-properties (1- bol) eol '(read-only t))
 
- 	(unwind-protect
 
- 	    (progn
 
- 	      (setq org-columns-overlays
 
- 		    (org-delete-all line-overlays org-columns-overlays))
 
- 	      (mapc 'delete-overlay line-overlays)
 
- 	      (org-columns-eval '(org-entry-put pom key nval)))
 
- 	  (org-columns-display-here)))
 
-       (org-move-to-column col)
 
-       (and (nth 3 (assoc key org-columns-current-fmt-compiled))
 
- 	   (org-columns-update key))))))
 
- (defun org-colview-construct-allowed-dates (s)
 
-   "Construct a list of three dates around the date in S.
 
- This respects the format of the time stamp in S, active or non-active,
 
- and also including time or not.  S must be just a time stamp, no text
 
- around it."
 
-   (when (and s (string-match (concat "^" org-ts-regexp3 "$") s))
 
-     (let* ((time (org-parse-time-string s 'nodefaults))
 
- 	   (active (equal (string-to-char s) ?<))
 
- 	   (fmt (funcall (if (nth 1 time) 'cdr 'car) org-time-stamp-formats))
 
- 	   time-before time-after)
 
-       (unless active (setq fmt (concat "[" (substring fmt 1 -1) "]")))
 
-       (setf (car time) (or (car time) 0))
 
-       (setf (nth 1 time) (or (nth 1 time) 0))
 
-       (setf (nth 2 time) (or (nth 2 time) 0))
 
-       (setq time-before (copy-sequence time))
 
-       (setq time-after (copy-sequence time))
 
-       (setf (nth 3 time-before) (1- (nth 3 time)))
 
-       (setf (nth 3 time-after) (1+ (nth 3 time)))
 
-       (mapcar (lambda (x) (format-time-string fmt (apply 'encode-time x)))
 
- 	      (list time-before time time-after)))))
 
- (defun org-verify-version (task)
 
-   (cond
 
-    ((eq task 'columns)
 
-     (if (or (featurep 'xemacs)
 
- 	    (< emacs-major-version 22))
 
- 	(error "Emacs 22 is required for the columns feature")))))
 
- (defun org-columns-open-link (&optional arg)
 
-   (interactive "P")
 
-   (let ((value (get-char-property (point) 'org-columns-value)))
 
-     (org-open-link-from-string value arg)))
 
- (defun org-columns-get-format-and-top-level ()
 
-   (let (fmt)
 
-     (when (condition-case nil (org-back-to-heading) (error nil))
 
-       (setq fmt (org-entry-get nil "COLUMNS" t)))
 
-     (setq fmt (or fmt org-columns-default-format))
 
-     (org-set-local 'org-columns-current-fmt fmt)
 
-     (org-columns-compile-format fmt)
 
-     (if (marker-position org-entry-property-inherited-from)
 
- 	(move-marker org-columns-top-level-marker
 
- 		     org-entry-property-inherited-from)
 
-       (move-marker org-columns-top-level-marker (point)))
 
-     fmt))
 
- (defun org-columns ()
 
-   "Turn on column view on an org-mode file."
 
-   (interactive)
 
-   (org-verify-version 'columns)
 
-   (org-columns-remove-overlays)
 
-   (move-marker org-columns-begin-marker (point))
 
-   (let ((org-columns-time (time-to-number-of-days (current-time)))
 
- 	beg end fmt cache maxwidths)
 
-     (setq fmt (org-columns-get-format-and-top-level))
 
-     (save-excursion
 
-       (goto-char org-columns-top-level-marker)
 
-       (setq beg (point))
 
-       (unless org-columns-inhibit-recalculation
 
- 	(org-columns-compute-all))
 
-       (setq end (or (condition-case nil (org-end-of-subtree t t) (error nil))
 
- 		    (point-max)))
 
-       ;; Get and cache the properties
 
-       (goto-char beg)
 
-       (when (assoc "CLOCKSUM" org-columns-current-fmt-compiled)
 
- 	(save-excursion
 
- 	  (save-restriction
 
- 	    (narrow-to-region beg end)
 
- 	    (org-clock-sum))))
 
-       (while (re-search-forward (concat "^" outline-regexp) end t)
 
- 	(if (and org-columns-skip-archived-trees
 
- 		 (looking-at (concat ".*:" org-archive-tag ":")))
 
- 	    (org-end-of-subtree t)
 
- 	  (push (cons (org-current-line) (org-entry-properties)) cache)))
 
-       (when cache
 
- 	(setq maxwidths (org-columns-get-autowidth-alist fmt cache))
 
- 	(org-set-local 'org-columns-current-maxwidths maxwidths)
 
- 	(org-columns-display-here-title)
 
- 	(when (org-set-local 'org-columns-flyspell-was-active
 
- 			     (org-bound-and-true-p flyspell-mode))
 
- 	  (flyspell-mode 0))
 
- 	(unless (local-variable-p 'org-colview-initial-truncate-line-value)
 
- 	  (org-set-local 'org-colview-initial-truncate-line-value
 
- 			 truncate-lines))
 
- 	(setq truncate-lines t)
 
- 	(mapc (lambda (x)
 
- 		(org-goto-line (car x))
 
- 		(org-columns-display-here (cdr x)))
 
- 	      cache)))))
 
- (eval-when-compile (defvar org-columns-time))
 
- (defvar org-columns-compile-map
 
-   '(("none" none +)
 
-     (":" add_times +)
 
-     ("+" add_numbers +)
 
-     ("$" currency +)
 
-     ("X" checkbox +)
 
-     ("X/" checkbox-n-of-m +)
 
-     ("X%" checkbox-percent +)
 
-     ("max" max_numbers max)
 
-     ("min" min_numbers min)
 
-     ("mean" mean_numbers
 
-      (lambda (&rest x) (/ (apply '+ x) (float (length x)))))
 
-     (":max" max_times max)
 
-     (":min" min_times min)
 
-     (":mean" mean_times
 
-      (lambda (&rest x) (/ (apply '+ x) (float (length x)))))
 
-     ("@min" min_age min (lambda (x) (- org-columns-time x)))
 
-     ("@max" max_age max (lambda (x) (- org-columns-time x)))
 
-     ("@mean" mean_age
 
-      (lambda (&rest x) (/ (apply '+ x) (float (length x))))
 
-      (lambda (x) (- org-columns-time x)))
 
-     ("est+" estimate org-estimate-combine))
 
-   "Operator <-> format,function,calc  map.
 
- Used to compile/uncompile columns format and completing read in
 
- interactive function `org-columns-new'.
 
- operator    string used in #+COLUMNS definition describing the
 
- 	    summary type
 
- format      symbol describing summary type selected interactively in
 
- 	    `org-columns-new' and internally in
 
- 	    `org-columns-number-to-string' and
 
- 	    `org-columns-string-to-number'
 
- function    called with a list of values as argument to calculate
 
- 	    the summary value
 
- calc        function called on every element before summarizing.  This is
 
- 	    optional and should only be specified if needed")
 
- (defun org-columns-new (&optional prop title width op fmt fun &rest rest)
 
-   "Insert a new column, to the left of the current column."
 
-   (interactive)
 
-   (let ((editp (and prop (assoc prop org-columns-current-fmt-compiled)))
 
- 	cell)
 
-     (setq prop (org-icompleting-read
 
- 		"Property: " (mapcar 'list (org-buffer-property-keys t nil t))
 
- 		nil nil prop))
 
-     (setq title (read-string (concat "Column title [" prop "]: ") (or title prop)))
 
-     (setq width (read-string "Column width: " (if width (number-to-string width))))
 
-     (if (string-match "\\S-" width)
 
- 	(setq width (string-to-number width))
 
-       (setq width nil))
 
-     (setq fmt (org-icompleting-read
 
- 	       "Summary [none]: "
 
- 	       (mapcar (lambda (x) (list (symbol-name (cadr x))))
 
- 		       org-columns-compile-map)
 
- 	       nil t))
 
-     (setq fmt (intern fmt)
 
- 	  fun (cdr (assoc fmt (mapcar 'cdr org-columns-compile-map))))
 
-     (if (eq fmt 'none) (setq fmt nil))
 
-     (if editp
 
- 	(progn
 
- 	  (setcar editp prop)
 
- 	  (setcdr editp (list title width nil fmt nil fun)))
 
-       (setq cell (nthcdr (1- (current-column))
 
- 			 org-columns-current-fmt-compiled))
 
-       (setcdr cell (cons (list prop title width nil fmt nil
 
- 			       (car fun) (cadr fun))
 
- 			 (cdr cell))))
 
-     (org-columns-store-format)
 
-     (org-columns-redo)))
 
- (defun org-columns-delete ()
 
-   "Delete the column at point from columns view."
 
-   (interactive)
 
-   (let* ((n (current-column))
 
- 	 (title (nth 1 (nth n org-columns-current-fmt-compiled))))
 
-     (when (y-or-n-p
 
- 	   (format "Are you sure you want to remove column \"%s\"? " title))
 
-       (setq org-columns-current-fmt-compiled
 
- 	    (delq (nth n org-columns-current-fmt-compiled)
 
- 		  org-columns-current-fmt-compiled))
 
-       (org-columns-store-format)
 
-       (org-columns-redo)
 
-       (if (>= (current-column) (length org-columns-current-fmt-compiled))
 
- 	  (backward-char 1)))))
 
- (defun org-columns-edit-attributes ()
 
-   "Edit the attributes of the current column."
 
-   (interactive)
 
-   (let* ((n (current-column))
 
- 	 (info (nth n org-columns-current-fmt-compiled)))
 
-     (apply 'org-columns-new info)))
 
- (defun org-columns-widen (arg)
 
-   "Make the column wider by ARG characters."
 
-   (interactive "p")
 
-   (let* ((n (current-column))
 
- 	 (entry (nth n org-columns-current-fmt-compiled))
 
- 	 (width (or (nth 2 entry)
 
- 		    (cdr (assoc (car entry) org-columns-current-maxwidths)))))
 
-     (setq width (max 1 (+ width arg)))
 
-     (setcar (nthcdr 2 entry) width)
 
-     (org-columns-store-format)
 
-     (org-columns-redo)))
 
- (defun org-columns-narrow (arg)
 
-   "Make the column narrower by ARG characters."
 
-   (interactive "p")
 
-   (org-columns-widen (- arg)))
 
- (defun org-columns-move-right ()
 
-   "Swap this column with the one to the right."
 
-   (interactive)
 
-   (let* ((n (current-column))
 
- 	 (cell (nthcdr n org-columns-current-fmt-compiled))
 
- 	 e)
 
-     (when (>= n (1- (length org-columns-current-fmt-compiled)))
 
-       (error "Cannot shift this column further to the right"))
 
-     (setq e (car cell))
 
-     (setcar cell (car (cdr cell)))
 
-     (setcdr cell (cons e (cdr (cdr cell))))
 
-     (org-columns-store-format)
 
-     (org-columns-redo)
 
-     (forward-char 1)))
 
- (defun org-columns-move-left ()
 
-   "Swap this column with the one to the left."
 
-   (interactive)
 
-   (let* ((n (current-column)))
 
-     (when (= n 0)
 
-       (error "Cannot shift this column further to the left"))
 
-     (backward-char 1)
 
-     (org-columns-move-right)
 
-     (backward-char 1)))
 
- (defun org-columns-store-format ()
 
-   "Store the text version of the current columns format in appropriate place.
 
- This is either in the COLUMNS property of the node starting the current column
 
- display, or in the #+COLUMNS line of the current buffer."
 
-   (let (fmt (cnt 0))
 
-     (setq fmt (org-columns-uncompile-format org-columns-current-fmt-compiled))
 
-     (org-set-local 'org-columns-current-fmt fmt)
 
-     (if (marker-position org-columns-top-level-marker)
 
- 	(save-excursion
 
- 	  (goto-char org-columns-top-level-marker)
 
- 	  (if (and (org-at-heading-p)
 
- 		   (org-entry-get nil "COLUMNS"))
 
- 	      (org-entry-put nil "COLUMNS" fmt)
 
- 	    (goto-char (point-min))
 
- 	    ;; Overwrite all #+COLUMNS lines....
 
- 	    (while (re-search-forward "^#\\+COLUMNS:.*" nil t)
 
- 	      (setq cnt (1+ cnt))
 
- 	      (replace-match (concat "#+COLUMNS: " fmt) t t))
 
- 	    (unless (> cnt 0)
 
- 	      (goto-char (point-min))
 
- 	      (or (org-on-heading-p t) (outline-next-heading))
 
- 	      (let ((inhibit-read-only t))
 
- 		(insert-before-markers "#+COLUMNS: " fmt "\n")))
 
- 	    (org-set-local 'org-columns-default-format fmt))))))
 
- (defvar org-agenda-overriding-columns-format nil
 
-   "When set, overrides any other format definition for the agenda.
 
- Don't set this, this is meant for dynamic scoping.")
 
- (defun org-columns-get-autowidth-alist (s cache)
 
-   "Derive the maximum column widths from the format and the cache."
 
-   (let ((start 0) rtn)
 
-     (while (string-match (org-re "%\\([[:alpha:]][[:alnum:]_-]*\\)") s start)
 
-       (push (cons (match-string 1 s) 1) rtn)
 
-       (setq start (match-end 0)))
 
-     (mapc (lambda (x)
 
- 	    (setcdr x (apply 'max
 
- 			     (mapcar
 
- 			      (lambda (y)
 
- 				(length (or (cdr (assoc (car x) (cdr y))) " ")))
 
- 			      cache))))
 
- 	  rtn)
 
-     rtn))
 
- (defun org-columns-compute-all ()
 
-   "Compute all columns that have operators defined."
 
-   (org-unmodified
 
-    (remove-text-properties (point-min) (point-max) '(org-summaries t)))
 
-   (let ((columns org-columns-current-fmt-compiled)
 
- 	(org-columns-time (time-to-number-of-days (current-time)))
 
- 	col)
 
-     (while (setq col (pop columns))
 
-       (when (nth 3 col)
 
- 	(save-excursion
 
- 	  (org-columns-compute (car col)))))))
 
- (defun org-columns-update (property)
 
-   "Recompute PROPERTY, and update the columns display for it."
 
-   (org-columns-compute property)
 
-   (let (fmt val pos)
 
-     (save-excursion
 
-       (mapc (lambda (ov)
 
- 	      (when (equal (overlay-get ov 'org-columns-key) property)
 
- 		(setq pos (overlay-start ov))
 
- 		(goto-char pos)
 
- 		(when (setq val (cdr (assoc property
 
- 					    (get-text-property
 
- 					     (point-at-bol) 'org-summaries))))
 
- 		  (setq fmt (overlay-get ov 'org-columns-format))
 
- 		  (overlay-put ov 'org-columns-value val)
 
- 		  (overlay-put ov 'display (format fmt val)))))
 
- 	    org-columns-overlays))))
 
- (defun org-columns-compute (property)
 
-   "Sum the values of property PROPERTY hierarchically, for the entire buffer."
 
-   (interactive)
 
-   (let* ((re (concat "^" outline-regexp))
 
- 	 (lmax 30) ; Does anyone use deeper levels???
 
- 	 (lvals (make-vector lmax nil))
 
- 	 (lflag (make-vector lmax nil))
 
- 	 (level 0)
 
- 	 (ass (assoc property org-columns-current-fmt-compiled))
 
- 	 (format (nth 4 ass))
 
- 	 (printf (nth 5 ass))
 
- 	 (fun (nth 6 ass))
 
- 	 (calc (or (nth 7 ass) 'identity))
 
- 	 (beg org-columns-top-level-marker)
 
- 	 last-level val valflag flag end sumpos sum-alist sum str str1 useval)
 
-     (save-excursion
 
-       ;; Find the region to compute
 
-       (goto-char beg)
 
-       (setq end (condition-case nil (org-end-of-subtree t) (error (point-max))))
 
-       (goto-char end)
 
-       ;; Walk the tree from the back and do the computations
 
-       (while (re-search-backward re beg t)
 
- 	(setq sumpos (match-beginning 0)
 
- 	      last-level level
 
- 	      level (org-outline-level)
 
- 	      val (org-entry-get nil property)
 
- 	      valflag (and val (string-match "\\S-" val)))
 
- 	(cond
 
- 	 ((< level last-level)
 
- 	  ;; put the sum of lower levels here as a property
 
- 	  (setq sum (when (aref lvals last-level)
 
- 		      (apply fun (aref lvals last-level)))
 
- 		flag (aref lflag last-level) ; any valid entries from children?
 
- 		str (org-columns-number-to-string sum format printf)
 
- 		str1 (org-add-props (copy-sequence str) nil 'org-computed t 'face 'bold)
 
- 		useval (if flag str1 (if valflag val ""))
 
- 		sum-alist (get-text-property sumpos 'org-summaries))
 
- 	  (if (assoc property sum-alist)
 
- 	      (setcdr (assoc property sum-alist) useval)
 
- 	    (push (cons property useval) sum-alist)
 
- 	    (org-unmodified
 
- 	     (add-text-properties sumpos (1+ sumpos)
 
- 				  (list 'org-summaries sum-alist))))
 
- 	  (when (and val (not (equal val (if flag str val))))
 
- 	    (org-entry-put nil property (if flag str val)))
 
- 	  ;; add current to current level accumulator
 
- 	  (when (or flag valflag)
 
- 	    (push (if flag
 
- 		      sum
 
- 		    (funcall calc (org-columns-string-to-number
 
- 				   (if flag str val) format)))
 
- 		  (aref lvals level))
 
- 	    (aset lflag level t))
 
- 	  ;; clear accumulators for deeper levels
 
- 	  (loop for l from (1+ level) to (1- lmax) do
 
- 		(aset lvals l nil)
 
- 		(aset lflag l nil)))
 
- 	 ((>= level last-level)
 
- 	  ;; add what we have here to the accumulator for this level
 
- 	  (when valflag
 
- 	    (push (funcall calc (org-columns-string-to-number val format))
 
- 		  (aref lvals level))
 
- 	    (aset lflag level t)))
 
- 	 (t (error "This should not happen")))))))
 
- (defun org-columns-redo ()
 
-   "Construct the column display again."
 
-   (interactive)
 
-   (message "Recomputing columns...")
 
-   (let ((line (org-current-line))
 
- 	(col (current-column)))
 
-     (save-excursion
 
-       (if (marker-position org-columns-begin-marker)
 
- 	  (goto-char org-columns-begin-marker))
 
-       (org-columns-remove-overlays)
 
-       (if (org-mode-p)
 
- 	  (call-interactively 'org-columns)
 
- 	(org-agenda-redo)
 
- 	(call-interactively 'org-agenda-columns)))
 
-     (org-goto-line line)
 
-     (move-to-column col))
 
-   (message "Recomputing columns...done"))
 
- (defun org-columns-not-in-agenda ()
 
-   (if (eq major-mode 'org-agenda-mode)
 
-       (error "This command is only allowed in Org-mode buffers")))
 
- (defun org-string-to-number (s)
 
-   "Convert string to number, and interpret hh:mm:ss."
 
-   (if (not (string-match ":" s))
 
-       (string-to-number s)
 
-     (let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
 
-       (while l
 
- 	(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
 
-       sum)))
 
- (defun org-columns-number-to-string (n fmt &optional printf)
 
-   "Convert a computed column number to a string value, according to FMT."
 
-   (cond
 
-    ((memq fmt '(estimate)) (org-estimate-print n printf))
 
-    ((not (numberp n)) "")
 
-    ((memq fmt '(add_times max_times min_times mean_times))
 
-     (let* ((h (floor n)) (m (floor (+ 0.5 (* 60 (- n h))))))
 
-       (format org-time-clocksum-format h m)))
 
-    ((eq fmt 'checkbox)
 
-     (cond ((= n (floor n)) "[X]")
 
- 	  ((> n 1.) "[-]")
 
- 	  (t "[ ]")))
 
-    ((memq fmt '(checkbox-n-of-m checkbox-percent))
 
-     (let* ((n1 (floor n)) (n2 (floor (+ .5 (* 1000000 (- n n1))))))
 
-       (org-nofm-to-completion n1 (+ n2 n1) (eq fmt 'checkbox-percent))))
 
-    (printf (format printf n))
 
-    ((eq fmt 'currency)
 
-     (format "%.2f" n))
 
-    ((memq fmt '(min_age max_age mean_age))
 
-     (org-format-time-period n))
 
-    (t (number-to-string n))))
 
- (defun org-nofm-to-completion (n m &optional percent)
 
-   (if (not percent)
 
-       (format "[%d/%d]" n m)
 
-     (format "[%d%%]"(floor (+ 0.5 (* 100. (/ (* 1.0 n) m)))))))
 
- (defun org-columns-string-to-number (s fmt)
 
-   "Convert a column value to a number that can be used for column computing."
 
-   (if s
 
-       (cond
 
-        ((memq fmt '(min_age max_age mean_age))
 
-         (cond ((string= s "") org-columns-time)
 
-               ((string-match
 
-                 "\\([0-9]+\\)d \\([0-9]+\\)h \\([0-9]+\\)m \\([0-9]+\\)s"
 
-                 s)
 
-                (+ (* 60 (+ (* 60 (+ (* 24 (string-to-number (match-string 1 s)))
 
-                                     (string-to-number (match-string 2 s))))
 
-                            (string-to-number (match-string 3 s))))
 
-                   (string-to-number (match-string 4 s))))
 
-               (t (time-to-number-of-days (apply 'encode-time
 
-                                                 (org-parse-time-string s t))))))
 
-        ((string-match ":" s)
 
-         (let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
 
-           (while l
 
-             (setq sum (+ (string-to-number (pop l)) (/ sum 60))))
 
-           sum))
 
-        ((memq fmt '(checkbox checkbox-n-of-m checkbox-percent))
 
-         (if (equal s "[X]") 1. 0.000001))
 
-        ((memq fmt '(estimate)) (org-string-to-estimate s))
 
-        (t (string-to-number s)))))
 
- (defun org-columns-uncompile-format (cfmt)
 
-   "Turn the compiled columns format back into a string representation."
 
-   (let ((rtn "") e s prop title op op-match width fmt printf fun calc)
 
-     (while (setq e (pop cfmt))
 
-       (setq prop (car e)
 
- 	    title (nth 1 e)
 
- 	    width (nth 2 e)
 
- 	    op (nth 3 e)
 
- 	    fmt (nth 4 e)
 
- 	    printf (nth 5 e)
 
- 	    fun (nth 6 e)
 
- 	    calc (nth 7 e))
 
-       (when (setq op-match (rassoc (list fmt fun calc) org-columns-compile-map))
 
- 	(setq op (car op-match)))
 
-       (if (and op printf) (setq op (concat op ";" printf)))
 
-       (if (equal title prop) (setq title nil))
 
-       (setq s (concat "%" (if width (number-to-string width))
 
- 		      prop
 
- 		      (if title (concat "(" title ")"))
 
- 		      (if op (concat "{" op "}"))))
 
-       (setq rtn (concat rtn " " s)))
 
-     (org-trim rtn)))
 
- (defun org-columns-compile-format (fmt)
 
-   "Turn a column format string into an alist of specifications.
 
- The alist has one entry for each column in the format.  The elements of
 
- that list are:
 
- property     the property
 
- title        the title field for the columns
 
- width        the column width in characters, can be nil for automatic
 
- operator     the operator if any
 
- format       the output format for computed results, derived from operator
 
- printf       a printf format for computed values
 
- fun          the lisp function to compute summary values, derived from operator
 
- calc         function to get values from base elements"
 
-   (let ((start 0) width prop title op op-match f printf fun calc)
 
-     (setq org-columns-current-fmt-compiled nil)
 
-     (while (string-match
 
- 	    (org-re "%\\([0-9]+\\)?\\([[:alnum:]_-]+\\)\\(?:(\\([^)]+\\))\\)?\\(?:{\\([^}]+\\)}\\)?\\s-*")
 
- 	    fmt start)
 
-       (setq start (match-end 0)
 
- 	    width (match-string 1 fmt)
 
- 	    prop (match-string 2 fmt)
 
- 	    title (or (match-string 3 fmt) prop)
 
- 	    op (match-string 4 fmt)
 
- 	    f nil
 
- 	    printf nil
 
- 	    fun '+
 
- 	    calc nil)
 
-       (if width (setq width (string-to-number width)))
 
-       (when (and op (string-match ";" op))
 
- 	(setq printf (substring op (match-end 0))
 
- 	      op (substring op 0 (match-beginning 0))))
 
-       (when (setq op-match (assoc op org-columns-compile-map))
 
- 	(setq f (cadr op-match)
 
- 	      fun (caddr op-match)
 
- 	      calc (cadddr op-match)))
 
-       (push (list prop title width op f printf fun calc)
 
- 	    org-columns-current-fmt-compiled))
 
-     (setq org-columns-current-fmt-compiled
 
- 	  (nreverse org-columns-current-fmt-compiled))))
 
- ;;; Dynamic block for Column view
 
- (defun org-columns-capture-view (&optional maxlevel skip-empty-rows)
 
-   "Get the column view of the current buffer or subtree.
 
- The first optional argument MAXLEVEL sets the level limit.  A
 
- second optional argument SKIP-EMPTY-ROWS tells whether to skip
 
- empty rows, an empty row being one where all the column view
 
- specifiers except ITEM are empty.  This function returns a list
 
- containing the title row and all other rows.  Each row is a list
 
- of fields."
 
-   (save-excursion
 
-     (let* ((title (mapcar 'cadr org-columns-current-fmt-compiled))
 
- 	   (re-comment (concat "\\*+[ \t]+" org-comment-string "\\>"))
 
- 	   (re-archive (concat ".*:" org-archive-tag ":"))
 
- 	   (n (length title)) row tbl)
 
-       (goto-char (point-min))
 
-       (while (re-search-forward "^\\(\\*+\\) " nil t)
 
- 	(catch 'next
 
- 	  (when (and (or (null maxlevel)
 
- 			 (>= maxlevel
 
- 			     (if org-odd-levels-only
 
- 				 (/ (1+ (length (match-string 1))) 2)
 
- 			       (length (match-string 1)))))
 
- 		     (get-char-property (match-beginning 0) 'org-columns-key))
 
- 	    (when (save-excursion
 
- 		    (goto-char (point-at-bol))
 
- 		    (or (looking-at re-comment)
 
- 			(looking-at re-archive)))
 
- 	      (org-end-of-subtree t)
 
- 	      (throw 'next t))
 
- 	    (setq row nil)
 
- 	    (loop for i from 0 to (1- n) do
 
- 		  (push
 
- 		   (org-quote-vert
 
- 		    (or (get-char-property (+ (match-beginning 0) i) 'org-columns-value-modified)
 
- 			(get-char-property (+ (match-beginning 0) i) 'org-columns-value)
 
- 			""))
 
- 		   row))
 
- 	    (setq row (nreverse row))
 
- 	    (unless (and skip-empty-rows
 
- 			 (eq 1 (length (delete "" (delete-dups (copy-sequence row))))))
 
- 	      (push row tbl)))))
 
-       (append (list title 'hline) (nreverse tbl)))))
 
- (defun org-dblock-write:columnview (params)
 
-   "Write the column view table.
 
- PARAMS is a property list of parameters:
 
- :width    enforce same column widths with <N> specifiers.
 
- :id       the :ID: property of the entry where the columns view
 
- 	  should be built.  When the symbol `local', call locally.
 
- 	  When `global' call column view with the cursor at the beginning
 
- 	  of the buffer (usually this means that the whole buffer switches
 
- 	  to column view).  When \"file:path/to/file.org\", invoke column
 
- 	  view at the start of that file.  Otherwise, the ID is located
 
- 	  using `org-id-find'.
 
- :hlines   When t, insert a hline before each item.  When a number, insert
 
- 	  a hline before each level <= that number.
 
- :vlines   When t, make each column a colgroup to enforce vertical lines.
 
- :maxlevel When set to a number, don't capture headlines below this level.
 
- :skip-empty-rows
 
- 	  When t, skip rows where all specifiers other than ITEM are empty."
 
-   (let ((pos (move-marker (make-marker) (point)))
 
- 	(hlines (plist-get params :hlines))
 
- 	(vlines (plist-get params :vlines))
 
- 	(maxlevel (plist-get params :maxlevel))
 
- 	(content-lines (org-split-string (plist-get params :content) "\n"))
 
- 	(skip-empty-rows (plist-get params :skip-empty-rows))
 
- 	tbl id idpos nfields tmp recalc line
 
- 	id-as-string view-file view-pos)
 
-     (when (setq id (plist-get params :id))
 
-       (setq id-as-string (cond ((numberp id) (number-to-string id))
 
- 			       ((symbolp id) (symbol-name id))
 
- 			       ((stringp id) id)
 
- 			       (t "")))
 
-       (cond ((not id) nil)
 
- 	    ((eq id 'global) (setq view-pos (point-min)))
 
- 	    ((eq id 'local))
 
- 	    ((string-match "^file:\\(.*\\)" id-as-string)
 
- 	     (setq view-file (match-string 1 id-as-string)
 
- 		   view-pos 1)
 
- 	     (unless (file-exists-p view-file)
 
- 	       (error "No such file: \"%s\"" id-as-string)))
 
- 	    ((setq idpos (org-find-entry-with-id id))
 
- 	     (setq view-pos idpos))
 
- 	    ((setq idpos (org-id-find id))
 
- 	     (setq view-file (car idpos))
 
- 	     (setq view-pos (cdr idpos)))
 
- 	    (t (error "Cannot find entry with :ID: %s" id))))
 
-     (with-current-buffer (if view-file
 
- 			     (get-file-buffer view-file)
 
- 			   (current-buffer))
 
-       (save-excursion
 
- 	(save-restriction
 
- 	  (widen)
 
- 	  (goto-char (or view-pos (point)))
 
- 	  (org-columns)
 
- 	  (setq tbl (org-columns-capture-view maxlevel skip-empty-rows))
 
- 	  (setq nfields (length (car tbl)))
 
- 	  (org-columns-quit))))
 
-     (goto-char pos)
 
-     (move-marker pos nil)
 
-     (when tbl
 
-       (when (plist-get params :hlines)
 
- 	(setq tmp nil)
 
- 	(while tbl
 
- 	  (if (eq (car tbl) 'hline)
 
- 	      (push (pop tbl) tmp)
 
- 	    (if (string-match "\\` *\\(\\*+\\)" (caar tbl))
 
- 		(if (and (not (eq (car tmp) 'hline))
 
- 			 (or (eq hlines t)
 
- 			     (and (numberp hlines)
 
- 				  (<= (- (match-end 1) (match-beginning 1))
 
- 				      hlines))))
 
- 		    (push 'hline tmp)))
 
- 	    (push (pop tbl) tmp)))
 
- 	(setq tbl (nreverse tmp)))
 
-       (when vlines
 
- 	(setq tbl (mapcar (lambda (x)
 
- 			    (if (eq 'hline x) x (cons "" x)))
 
- 			  tbl))
 
- 	(setq tbl (append tbl (list (cons "/" (make-list nfields "<>"))))))
 
-       (setq pos (point))
 
-       (when content-lines
 
- 	(while (string-match "^#" (car content-lines))
 
- 	  (insert (pop content-lines) "\n")))
 
-       (insert (org-listtable-to-string tbl))
 
-       (when (plist-get params :width)
 
- 	(insert "\n|" (mapconcat (lambda (x) (format "<%d>" (max 3 x)))
 
- 				 org-columns-current-widths "|")))
 
-       (while (setq line (pop content-lines))
 
- 	(when (string-match "^#" line)
 
- 	  (insert "\n" line)
 
- 	  (when (string-match "^[ \t]*#\\+TBLFM" line)
 
- 	    (setq recalc t))))
 
-       (if recalc
 
- 	  (progn (goto-char pos) (org-table-recalculate 'all))
 
- 	(goto-char pos)
 
- 	(org-table-align)))))
 
- (defun org-listtable-to-string (tbl)
 
-   "Convert a listtable TBL to a string that contains the Org-mode table.
 
- The table still need to be aligned.  The resulting string has no leading
 
- and tailing newline characters."
 
-   (mapconcat
 
-    (lambda (x)
 
-      (cond
 
-       ((listp x)
 
-        (concat "|" (mapconcat 'identity x "|") "|"))
 
-       ((eq x 'hline) "|-|")
 
-       (t (error "Garbage in listtable: %s" x))))
 
-    tbl "\n"))
 
- (defun org-insert-columns-dblock ()
 
-   "Create a dynamic block capturing a column view table."
 
-   (interactive)
 
-   (let ((defaults '(:name "columnview" :hlines 1))
 
- 	(id (org-icompleting-read
 
- 	     "Capture columns (local, global, entry with :ID: property) [local]: "
 
- 	     (append '(("global") ("local"))
 
- 		     (mapcar 'list (org-property-values "ID"))))))
 
-     (if (equal id "") (setq id 'local))
 
-     (if (equal id "global") (setq id 'global))
 
-     (setq defaults (append defaults (list :id id)))
 
-     (org-create-dblock defaults)
 
-     (org-update-dblock)))
 
- ;;; Column view in the agenda
 
- (defvar org-agenda-view-columns-initially nil
 
-   "When set, switch to columns view immediately after creating the agenda.")
 
- (defvar org-agenda-columns-show-summaries) ; defined in org-agenda.el
 
- (defvar org-agenda-columns-compute-summary-properties); defined in org-agenda.el
 
- (defvar org-agenda-columns-add-appointments-to-effort-sum); as well
 
- (defun org-agenda-columns ()
 
-   "Turn on or update column view in the agenda."
 
-   (interactive)
 
-   (org-verify-version 'columns)
 
-   (org-columns-remove-overlays)
 
-   (move-marker org-columns-begin-marker (point))
 
-   (let ((org-columns-time (time-to-number-of-days (current-time)))
 
- 	 cache maxwidths m p a d fmt)
 
-     (cond
 
-      ((and (boundp 'org-agenda-overriding-columns-format)
 
- 	   org-agenda-overriding-columns-format)
 
-       (setq fmt org-agenda-overriding-columns-format)
 
-       (org-set-local 'org-agenda-overriding-columns-format fmt))
 
-      ((setq m (org-get-at-bol 'org-hd-marker))
 
-       (setq fmt (or (org-entry-get m "COLUMNS" t)
 
- 		    (with-current-buffer (marker-buffer m)
 
- 		      org-columns-default-format))))
 
-      ((and (boundp 'org-columns-current-fmt)
 
- 	   (local-variable-p 'org-columns-current-fmt)
 
- 	   org-columns-current-fmt)
 
-       (setq fmt org-columns-current-fmt))
 
-      ((setq m (next-single-property-change (point-min) 'org-hd-marker))
 
-       (setq m (get-text-property m 'org-hd-marker))
 
-       (setq fmt (or (org-entry-get m "COLUMNS" t)
 
- 		    (with-current-buffer (marker-buffer m)
 
- 		      org-columns-default-format)))))
 
-     (setq fmt (or fmt org-columns-default-format))
 
-     (org-set-local 'org-columns-current-fmt fmt)
 
-     (org-columns-compile-format fmt)
 
-     (when org-agenda-columns-compute-summary-properties
 
-       (org-agenda-colview-compute org-columns-current-fmt-compiled))
 
-     (save-excursion
 
-       ;; Get and cache the properties
 
-       (goto-char (point-min))
 
-       (while (not (eobp))
 
- 	(when (setq m (or (org-get-at-bol 'org-hd-marker)
 
- 			  (org-get-at-bol 'org-marker)))
 
- 	  (setq p (org-entry-properties m))
 
- 	  (when (or (not (setq a (assoc org-effort-property p)))
 
- 			 (not (string-match "\\S-" (or (cdr a) ""))))
 
- 	    ;; OK, the property is not defined.  Use appointment duration?
 
- 	    (when (and org-agenda-columns-add-appointments-to-effort-sum
 
- 		       (setq d (get-text-property (point) 'duration)))
 
- 	      (setq d (org-minutes-to-hh:mm-string d))
 
- 	      (put-text-property 0 (length d) 'face 'org-warning d)
 
- 	      (push (cons org-effort-property d) p)))
 
- 	  (push (cons (org-current-line) p) cache))
 
- 	(beginning-of-line 2))
 
-       (when cache
 
- 	(setq maxwidths (org-columns-get-autowidth-alist fmt cache))
 
- 	(org-set-local 'org-columns-current-maxwidths maxwidths)
 
- 	(org-columns-display-here-title)
 
- 	(when (org-set-local 'org-columns-flyspell-was-active
 
- 			     (org-bound-and-true-p flyspell-mode))
 
- 	  (flyspell-mode 0))
 
- 	(mapc (lambda (x)
 
- 		(org-goto-line (car x))
 
- 		(org-columns-display-here (cdr x)))
 
- 	      cache)
 
- 	(when org-agenda-columns-show-summaries
 
- 	  (org-agenda-colview-summarize cache))))))
 
- (defun org-agenda-colview-summarize (cache)
 
-   "Summarize the summarizable columns in column view in the agenda.
 
- This will add overlays to the date lines, to show the summary for each day."
 
-   (let* ((fmt (mapcar (lambda (x)
 
- 			(if (equal (car x) "CLOCKSUM")
 
- 			    (list "CLOCKSUM" (nth 1 x) (nth 2 x) ":" 'add_times
 
- 				  nil '+ nil)
 
- 			  x))
 
- 		      org-columns-current-fmt-compiled))
 
- 	 line c c1 stype calc sumfunc props lsum entries prop v title)
 
-     (catch 'exit
 
-       (when (delq nil (mapcar 'cadr fmt))
 
- 	;; OK, at least one summation column, it makes sense to try this
 
- 	(goto-char (point-max))
 
- 	(while t
 
- 	  (when (or (get-text-property (point) 'org-date-line)
 
- 		    (eq (get-text-property (point) 'face)
 
- 			'org-agenda-structure))
 
- 	    ;; OK, this is a date line that should be used
 
- 	    (setq line (org-current-line))
 
- 	    (setq entries nil c cache cache nil)
 
- 	    (while (setq c1 (pop c))
 
- 	      (if (> (car c1) line)
 
- 		  (push c1 entries)
 
- 		(push c1 cache)))
 
- 	    ;; now ENTRIES are the ones we want to use, CACHE is the rest
 
- 	    ;; Compute the summaries for the properties we want,
 
- 	    ;; set nil properties for the rest.
 
- 	    (when (setq entries (mapcar 'cdr entries))
 
- 	      (setq props
 
- 		    (mapcar
 
- 		     (lambda (f)
 
- 		       (setq prop (car f)
 
- 			     title (nth 1 f)
 
- 			     stype (nth 4 f)
 
- 			     sumfunc (nth 6 f)
 
- 			     calc (or (nth 7 f) 'identity))
 
- 		       (cond
 
- 			((equal prop "ITEM")
 
- 			 (cons prop (buffer-substring (point-at-bol)
 
- 						      (point-at-eol))))
 
- 			((not stype) (cons prop ""))
 
- 			(t ;; do the summary
 
- 			 (setq lsum nil)
 
- 			 (dolist (x entries)
 
- 			   (setq v (cdr (assoc prop x)))
 
- 			   (if v
 
- 			       (push
 
- 				(funcall
 
- 				 (if (not (get-text-property 0 'org-computed v))
 
- 				     calc
 
- 				   'identity)
 
- 				 (org-columns-string-to-number
 
- 				  v stype))
 
- 				lsum)))
 
- 			 (setq lsum (remove nil lsum))
 
- 			 (setq lsum
 
- 			       (cond ((> (length lsum) 1)
 
- 				      (org-columns-number-to-string
 
- 				       (apply sumfunc lsum) stype))
 
- 				     ((eq (length lsum) 1)
 
- 				      (org-columns-number-to-string
 
- 				       (car lsum) stype))
 
- 				     (t "")))
 
- 			 (put-text-property 0 (length lsum) 'face 'bold lsum)
 
- 			 (unless (eq calc 'identity)
 
- 			   (put-text-property 0 (length lsum) 'org-computed t lsum))
 
- 			 (cons prop lsum))))
 
- 		     fmt))
 
- 	      (org-columns-display-here props 'dateline)
 
- 	      (org-set-local 'org-agenda-columns-active t)))
 
- 	  (if (bobp) (throw 'exit t))
 
- 	  (beginning-of-line 0))))))
 
- (defun org-agenda-colview-compute (fmt)
 
-   "Compute the relevant columns in the contributing source buffers."
 
-   (let ((files org-agenda-contributing-files)
 
- 	(org-columns-begin-marker (make-marker))
 
- 	(org-columns-top-level-marker (make-marker))
 
- 	f fm a b)
 
-     (while (setq f (pop files))
 
-       (setq b (find-buffer-visiting f))
 
-       (with-current-buffer (or (buffer-base-buffer b) b)
 
- 	(save-excursion
 
- 	  (save-restriction
 
- 	    (widen)
 
- 	    (org-unmodified
 
- 	     (remove-text-properties (point-min) (point-max)
 
- 				     '(org-summaries t)))
 
- 	    (goto-char (point-min))
 
- 	    (org-columns-get-format-and-top-level)
 
- 	    (while (setq fm (pop fmt))
 
- 	      (if (equal (car fm) "CLOCKSUM")
 
- 		  (org-clock-sum)
 
- 		(when (and (nth 4 fm)
 
- 			   (setq a (assoc (car fm)
 
- 					  org-columns-current-fmt-compiled))
 
- 			   (equal (nth 4 a) (nth 4 fm)))
 
- 		  (org-columns-compute (car fm)))))))))))
 
- (defun org-format-time-period (interval)
 
-   "Convert time in fractional days to days/hours/minutes/seconds."
 
-   (if (numberp interval)
 
-     (let* ((days (floor interval))
 
- 	   (frac-hours (* 24 (- interval days)))
 
- 	   (hours (floor frac-hours))
 
- 	   (minutes (floor (* 60 (- frac-hours hours))))
 
- 	   (seconds (floor (* 60 (- (* 60 (- frac-hours hours)) minutes)))))
 
-       (format "%dd %02dh %02dm %02ds" days hours minutes seconds))
 
-     ""))
 
- (defun org-estimate-mean-and-var (v)
 
-   "Return the mean and variance of an estimate."
 
-   (let* ((low (float (car v)))
 
-          (high (float (cadr v)))
 
-          (mean (/ (+ low high) 2.0))
 
-          (var (/ (+ (expt (- mean low) 2.0) (expt (- high mean) 2.0)) 2.0)))
 
-     (list  mean var)))
 
- (defun org-estimate-combine (&rest el)
 
-   "Combine a list of estimates, using mean and variance.
 
- The mean and variance of the result will be the sum of the means
 
- and variances (respectively) of the individual estimates."
 
-   (let ((mean 0)
 
-         (var 0))
 
-     (mapc (lambda (e)
 
-               (let ((stats (org-estimate-mean-and-var e)))
 
-                 (setq mean (+ mean (car stats)))
 
-                 (setq var (+ var (cadr stats)))))
 
-             el)
 
-     (let ((stdev (sqrt var)))
 
-       (list (- mean stdev) (+ mean stdev)))))
 
- (defun org-estimate-print (e &optional fmt)
 
-   "Prepare a string representation of an estimate.
 
- This formats these numbers as two numbers with a \"-\" between them."
 
-   (if (null fmt) (set 'fmt "%.0f"))
 
-   (format "%s" (mapconcat (lambda (n) (format fmt n))  e "-")))
 
- (defun org-string-to-estimate (s)
 
-   "Convert a string to an estimate.
 
- The string should be two numbers joined with a \"-\"."
 
-   (if (string-match "\\(.*\\)-\\(.*\\)" s)
 
-       (list (string-to-number (match-string 1 s))
 
- 	    (string-to-number(match-string 2 s)))
 
-     (list (string-to-number s) (string-to-number s))))
 
- (provide 'org-colview)
 
- ;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
 
- ;;; org-colview.el ends here
 
 
  |