Merge branch 'maint'
This commit is contained in:
commit
b171ff02f6
5 changed files with 37 additions and 18 deletions
|
@ -5700,13 +5700,17 @@ This dynamic block has the following parameters:
|
|||
|
||||
The following commands insert or update the dynamic block:
|
||||
|
||||
- {{{kbd(C-c C-x i)}}} (~org-insert-columns-dblock~) ::
|
||||
- ~org-columns-insert-dblock~ ::
|
||||
|
||||
#+kindex: C-c C-x i
|
||||
#+findex: org-insert-columns-dblock
|
||||
#+kindex: C-c C-x x
|
||||
#+findex: org-columns-insert-dblock
|
||||
Insert a dynamic block capturing a column view. Prompt for the
|
||||
scope or ID of the view.
|
||||
|
||||
This command can be invoked by calling
|
||||
~org-dynamic-block-insert-dblock~ ({{{kbd(C-c C-x x)}}}) and
|
||||
selecting "columnview" (see [[*Dynamic Blocks]]).
|
||||
|
||||
- {{{kbd(C-c C-c)}}} {{{kbd(C-c C-x C-u)}}} (~org-dblock-update~) ::
|
||||
|
||||
#+kindex: C-c C-c
|
||||
|
@ -6545,13 +6549,19 @@ Org mode can produce quite complex reports based on the time clocking
|
|||
information. Such a report is called a /clock table/, because it is
|
||||
formatted as one or several Org tables.
|
||||
|
||||
You can insert, or update, a clock table through Org dynamic blocks
|
||||
insert command (see [[*Dynamic Blocks]]), by pressing {{{kbd(C-c C-x
|
||||
x c l o c k t a b l e RET)}}}. When called with a prefix argument,
|
||||
jump to the first clock table in the current document and update it.
|
||||
The clock table includes archived trees.
|
||||
|
||||
#+attr_texinfo: :sep ,
|
||||
- ~org-clock-report~ ::
|
||||
|
||||
#+kindex: C-c C-x x
|
||||
#+findex: org-clock-report
|
||||
Insert or update a clock table. When called with a prefix argument,
|
||||
jump to the first clock table in the current document and update it.
|
||||
The clock table includes archived trees.
|
||||
|
||||
This command can be invoked by calling
|
||||
~org-dynamic-block-insert-dblock~ ({{{kbd(C-c C-x x)}}}) and
|
||||
selecting "clocktable" (see [[*Dynamic Blocks]]).
|
||||
|
||||
- {{{kbd(C-c C-c)}}} or {{{kbd(C-c C-x C-u)}}} (~org-dblock-update~) ::
|
||||
|
||||
#+kindex: C-c C-c
|
||||
|
@ -6576,7 +6586,7 @@ The clock table includes archived trees.
|
|||
=:block= is =today=, it is shifted to =today-1=, etc.
|
||||
|
||||
Here is an example of the frame for a clock table as it is inserted
|
||||
into the buffer with the {{{kbd(C-c C-x C-r)}}} command:
|
||||
into the buffer by ~org-clock-report~:
|
||||
|
||||
#+cindex: @samp{BEGIN clocktable}
|
||||
#+begin_example
|
||||
|
|
|
@ -513,7 +513,7 @@ after ``{\tt :}'', and dictionary words elsewhere.
|
|||
\key{special commands in property lines}{C-c C-c}
|
||||
\key{next/previous allowed value}{S-LEFT/RIGHT}
|
||||
\key{turn on column view}{C-c C-x C-c}
|
||||
\key{capture columns view in dynamic block}{C-c C-x i}
|
||||
\key{capture columns view in dynamic block}{C-c C-x x}
|
||||
|
||||
\key{quit column view}{q}
|
||||
\key{show full value}{v}
|
||||
|
@ -556,7 +556,7 @@ after ``{\tt :}'', and dictionary words elsewhere.
|
|||
\key{stop/cancel clock on current item}{C-c C-x C-o/x}
|
||||
\key{display total subtree times}{C-c C-x C-d}
|
||||
\key{remove displayed times}{C-c C-c}
|
||||
\key{insert/update table with clock report}{C-c C-x C-r}
|
||||
\key{insert/update table with clock report}{C-c C-x C-x}
|
||||
|
||||
\section{Agenda Views}
|
||||
|
||||
|
|
|
@ -2133,7 +2133,10 @@ in the buffer and update it."
|
|||
(start (goto-char start)))
|
||||
(org-update-dblock))
|
||||
|
||||
(org-dynamic-block-define "clocktable" #'org-clock-report)
|
||||
;;;###autoload
|
||||
(eval-after-load 'org
|
||||
'(progn
|
||||
(org-dynamic-block-define "clocktable" #'org-clock-report)))
|
||||
|
||||
(defun org-day-of-week (day month year)
|
||||
"Return the day of the week as an integer."
|
||||
|
|
|
@ -1567,7 +1567,10 @@ PARAMS is a property list of parameters:
|
|||
(id)))))
|
||||
(org-update-dblock))
|
||||
|
||||
(org-dynamic-block-define "columnview" #'org-columns-insert-dblock)
|
||||
;;;###autoload
|
||||
(eval-after-load 'org
|
||||
'(progn
|
||||
(org-dynamic-block-define "columnview" #'org-columns-insert-dblock)))
|
||||
|
||||
|
||||
;;; Column view in the agenda
|
||||
|
|
11
lisp/org.el
11
lisp/org.el
|
@ -9111,15 +9111,18 @@ block of such type."
|
|||
(`nil (push (cons type func) org-dynamic-block-alist))
|
||||
(def (setcdr def func))))
|
||||
|
||||
(defun org-dynamic-block-insert-dblock (type)
|
||||
(defun org-dynamic-block-insert-dblock (type &optional interactive-p)
|
||||
"Insert a dynamic block of type TYPE.
|
||||
When used interactively, select the dynamic block types among
|
||||
defined types, per `org-dynamic-block-define'."
|
||||
defined types, per `org-dynamic-block-define'. If INTERACTIVE-P
|
||||
is non-nil, call the dynamic block function interactively."
|
||||
(interactive (list (completing-read "Dynamic block: "
|
||||
(org-dynamic-block-types))))
|
||||
(org-dynamic-block-types))
|
||||
t))
|
||||
(pcase (org-dynamic-block-function type)
|
||||
(`nil (error "No such dynamic block: %S" type))
|
||||
((and f (pred functionp)) (funcall f))
|
||||
((and f (pred functionp))
|
||||
(if interactive-p (call-interactively f) (funcall f)))
|
||||
(_ (error "Invalid function for dynamic block %S" type))))
|
||||
|
||||
(defun org-dblock-update (&optional arg)
|
||||
|
|
Loading…
Reference in a new issue