mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-05-15 17:39:44 -07:00
8bfe682a6f
* org.el (org-clone-subtree-with-time-shift): Make it work at the
end of the buffer.
* org-mobile.el (org-mobile-write-checksums): Specify coding
system.
(org-mobile-timestamp-buffer): Keep local variable/mode line at
beginning of buffer.
* org-latex.el (org-latex-entities-regexp): Fix typo in regexp.
* org.el (org-block-todo-from-children-or-siblings-or-parent)
(org-block-todo-from-checkboxes): Do not block changes to a nil
TODO state.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-habit.el (org-habit-parse-todo): Indicate which habit is
wrongly set up in the error messages.
* org-colview.el (org-columns-display-here): Don't try to
calculate values if the underlying property is not set.
(org-columns-string-to-number): Convert age strings back into
fractional days.
(org-agenda-colview-summarize): Handle extended summary types
properly.
* org-colview-xemacs.el (org-columns-display-here): Don't try to
calculate values if the underlying property is not set.
(org-columns-string-to-number): Convert age strings back into
fractional days.
(org-agenda-colview-summarize): Handle extended summary types
properly.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-drawer-function): New variable.
(org-export-format-drawer): New function.
(org-export-preprocess-string): Pass the backend as a parameter to
`org-export-remove-or-extract-drawers'.
(org-export-remove-or-extract-drawers): New parameter BACKEND.
* org-protocol.el (org-protocol-char-to-string): New defsubst.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Add error
message when no block is selected.
* org-latex.el (org-export-latex-links): Check for protectedness
in the last matched character, not after the match.
* org-datetree.el (org-datetree-find-date-create): Respect
restriction when KEEP-RESTRICTION is set.
(org-datetree-file-entry-under): New function.
(org-datetree-cleanup): New command.
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-edit-src-code): New optional argument context
allows calling functions to avoid altering the saved window
configuration.
(org-edit-src-exit): Do not restore window configuration when this
function is used in the context of saving the edit buffer.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-out, org-clock-cancel): Revert to
instances to switching to with-current-buffer, because these seem
to cause problems - no idea why.
* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Require diary-lib for (diary-date-display-form).
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-log-reschedule, org-log-redeadline): New options.
(org-log-note-headings): Add templates for rescheduling and
deadline changing.
(org-startup-options): Add in-buffer settings for logging changing
schedule and deadline time stamps.
(org-deadline, org-schedule): Check for existing date and arrange
for logging if the user requests it.
(org-add-log-note): Prepare proper note buffers for rescheduling
and deadline changes.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file)
(org-agenda-add-entry-to-org-agenda-diary-file)
(org-agenda-insert-diary-make-new-entry): New functions.
(org-agenda-diary-entry): Call
`org-agenda-diary-entry-in-org-file' when appropriate.
* org.el (org-calendar-insert-diary-entry-key): New option.
(org-agenda-diary-file): New option.
("calendar"): Install our insertion function in the calendar.
* org-remember.el (org-datetree): Require.
(org-remember-templates): Add new positioning option.
(org-remember-reference-date): New variable.
(org-remember-apply-template): Store the reference date in a local
variable.
(org-remember-handler): Implement date tree positioning of entries.
* org-datetree.el: New file.
* org-latex.el (org-export-latex-preprocess): Protect targets in
verbatim emphasis.
* org-html.el (org-export-as-html): Protect targets in verbatim
emphasis.
* org-docbook.el (org-export-as-docbook): Protect targets in
verbatim emphasis.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-show-notification): Handle messages that
contain a percent character.
* org-remember.el (org-remember-apply-template): Turn of partial
completion.
* org-mobile.el (org-mobile-before-process-capture-hook): New hook.
(org-mobile-pull): Run `org-mobile-before-process-capture-hook'.
* org.el (org-indent-mode): Define variable already in org.el.
(org-unfontify-region): Remove line-prefix and wrap-prefix
properties only if org-indent-mode is active.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-print-icalendar-entries): Save match data
around call to verify function.
(org-print-icalendar-entries): Add a call to the verification
function.
* org.el (org-speedbar-set-agenda-restriction): Remove unnecessary
save-restrivtion' form.
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-exp.el (org-export-format-source-code-or-example): restrict
scope of preserve-indentp to the let binding.
(org-src): require org-src, since org-src-preserve-indentation is used.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-set-timer): Set variables
org-timer-timer[123] correctly.
* org-mobile.el (org-mobile-files-alist): Make it work when
`agenda-archives' is included in
`org-agenda-text-search-extra-files'.
(org-mobile-push): Restore agenda after mobile push.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-resolve-clocks-if-idle): Another fix to the
way the amount of idle time is presented in the minibuffer.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-print-icalendar-entries): Use
org-icalendar-verify-function only if non-nil.
* org.el (org-refile): Refile to clock only if the prefix arg is
2.
(org-sparse-tree): Fix docstring to be in line with prompt.
(org-update-parent-todo-statistics): Call
`org-after-todo-statistics-hook' on each level.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-apply-template): Make sure the
buffer exists.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-tab-ind-state): New variable.
(org-cycle-level): New function.
(org-cycle-level-after-item/entry-creation): New option.
(org-flag-subtree): New function.
(org-hide-archived-subtrees): Call `org-flag-subtree'.
(org-set-effort): Indexed access.
* org-list.el (org-cycle-item-indentation): New function.
* org.el (org-refile): Make prefix argument 2 refile to current
clock.
(org-priority): Interpret action `remove' as call to remove the
priority cookie.
* org-remember.el (org-remember-apply-template): Don't depend on
buffer name being like file name.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-play-sound): Expand file in
org-clock-sound, to allow ~ for home.
* org-remember.el (org-remember-handler): Set
text-before-node-creation even if this already looks like a node,
because the string might be needed on non-org-mode target files.
* org-agenda.el (org-agenda-open-link): Make this work in agenda
clocktables.
(org-agenda-switch-to): Follow a link at point if
org-return-follows-link' is set and there is nothing else to do in
this line.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview-xemacs.el: Add in changes from org-colview.el
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-exp-blocks.el: Modify split separator regexp to avoid empty
strings.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-columns-new): Make this work with the new
operators.
(org-columns-store-format): Make this work with the new operators.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-src-preserve-indentation): Document that this
variable is also used during export.
* org-exp.el (org-export-format-source-code-or-example): Preserve
indentation if a block has a -i option, or if
`org-src-preserve-indentation' is set.
* org-exp-blocks.el (org-export-blocks-preprocess): Preserve
indentation if a block has a -i option, or if
`org-src-preserve-indentation' is set.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-mode-map): Define the new archiving keys.
(org-speed-commands-default): Define an archiving key in the speed
command map.
(org-org-menu): Improve the menu structure concerning archiving.
* org-archive.el (org-archive-subtree-default-with-confirmation):
New command.
* org-agenda.el (org-agenda-mode-map): Define the new archiving keys.
(org-agenda-menu): Add the new archiving commands to the menu.
(org-agenda-archive-default)
(org-agenda-archive-default-with-confirmation): New commands.
(org-agenda-archive, org-agenda-archive-to-archive-sibling): Just
call `org-agenda-archive-with'.
(org-agenda-archive-with): New function.
* org-table.el (org-table-convert-region): Inert spaces around "|"
to avoid line beginnings like "|-1" which will be mistaken as
hlines.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-offer-links-in-entry): Return nil if there are no
links, t if a link has been selected.
(org-open-at-point): Open attachment directory when called in the
headline and there are no links in the entry body.
(org-speed-commands-default): Add "o" for open-at-point as a speed
command.
* org-attach.el (org-attach-reveal): Optional prefix arg
IF-EXISTS, which avoids creating the attachment directory if it
does not yet exist.
* org-agenda.el (org-agenda, org-run-agenda-series): Evaluate
MATCH.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el ("abbrev"): Work with abbrev tables only after they have
been loaded.
* org-list.el (org-list-send-list): Fix bug related to match
data.
* org-latex.el (org-export-latex-fontify): Apply verbatim
emphasis.
(org-export-latex-make-header): Insert \obeylines if line breaks
should be preserved.
* org-exp.el (org-export-protect-verbatim): Add an
`org-verbatim-emph' property to such text.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-icalendar-use-plain-timestamp): New option.
(org-print-icalendar-entries): Skip entries where the timestamp is
not a deadline and not scheduled, if the user requests that.
* org-latex.el (org-export-latex-quotation-marks): Allow a bracket
before an opening quote.
* org-archive.el (org-archive-subtree): Keep archive after
archiving something.
* org-id.el (org-id-update-id-locations): Add archive files if
that is required by `org-id-extra-files'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-src-window-setup): New option.
(org-src-switch-to-buffer): New function.
(org-edit-src-exit): Add optional argument CONTEXT and use it to
restore window configuration.
(org-edit-src-code, org-edit-src-continue, org-edit-src-exit):
Call `org-src-switch-to-buffer'.
* org.el (org-default-properties): Add STYLE property.
(org-files-list): Use the function call to get the files.
(org-additional-option-like-keywords): Add SETUPFILE to completion
list.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-convert-region): Correctly interpret
quoting in csv import.
* org.el (org-icompleting-read): Make iswitchb completion work
with lists and tables.
* org-agenda.el (org-agenda-add-entry-text): Never add entry text
while pushing the mobile agenda.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el
(org-clock-auto-clock-resolution): Now takes three values: nil, t
and `when-no-clock-is-running'.
(org-clock-in): Use `org-clock-auto-clock-resolution' to determine
whether or not to resolve Org buffers on clock in.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-format-time-period): Function to format
times in fractional days for display.
(org-columns-display-here): Add support for showing a calculated
value in place of the property.
(org-columns): Set `org-columns-time' to the current time so time
difference calculations will work.
(org-columns-time): Use to store the current time when column view
is displayed, so all time differences will use the same reference
point.
(org-columns-compile-map): There is now an extra position in each
entry specifying the function to use to calculate the displayed
value for the non-calculated properties in the column,
(org-columns-compute-all): Set `org-columns-time' to the current
time so time difference calculations will work.
(org-columns-compute): Handle column operators where the values
used are calculated from the underlying property.
(org-columns-number-to-string): Handle the 'age' column format
(org-columns-string-to-number): Correct the function name (was
org-column...). Add support for the 'age' column format.
(org-columns-compile-format): Support the additional parameter in
org-columns-compile-map.
2009-11-13 Bastien Guerry <bzg@altern.org>
* org.el (org-mode-hook): Turn `org-mode-hook' into a customizable
variable.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-has-been-used): New variable.
(org-clock-in): Set `org-clock-has-been-used'.
(org-clock-save): Save only if clock data has been used or created
during this session.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-persist): New value, to store only the
clock history.
(org-clock-save): Don't save the clock if only the history should
be stored.
(org-clock-load): Turn off John Wiegley's auto resolving mechanism
when restoring a saved clock.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-clock-display, org-clock-put-overlay): Use
`org-time-clock-use-fractional'.
* org.el (org-time-clocksum-use-fractional)
(org-time-clocksum-fractional-format): Two new customizable
variables which allow the user to select fractional times (1.25
instead of 1:25) in the `org-clock-display' report.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-ascii.el (org-export-ascii-table-keep-all-vertical-lines):
New option.
* org.el (org-tag-alist): Fix customization type.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-update-checksum-for-capture-file):
Make sure the regexp search can fail without throwing an error.
(org-mobile-apply): Save the inbox buffer after removing
successfully applied changes.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-resolve-clocks-if-idle): Fix to the way idle
time is reported after the user comes back (but before they
resolve time).
* org.el (org-get-repeat): Change so that this function can be
called with either `org-scheduled-string' or
`org-deadline-string'.
* org-clock.el (org-clock-auto-clock-resolution): Renamed
`org-clock-disable-clock-resolution', since negatives don't sound
good in customization variables.
(org-clock-in): Don't use the auto-resolution logic if the user is
clocking into a different task while an active clock is running.
This then allows the default behavior of clocking out of the open
task and then into the new task.
* org.el (org-modules): Made this variable more consistent, since
it was referring to Org, OrgMode and Org-mode, whereas the docs
for the variable always refer to Org-mode.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-repeat-re): The changed org-repeat-re no longer
matched simple +2d type repeaters. Fix it so it does.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Protect the vspace
macro in the VERSE environment.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-habit.el (org-habit-get-priority): A new function that
determines the relative priority of a habit, based on how long
past its scheduled date it is, and how near the deadline is.
* org-agenda.el (org-agenda-get-scheduled): Set habit priority
using `org-habit-get-priority'.
* org-habit.el (org-habit-build-graph): Start displaying colors
from the first scheduled date, if that date is earlier than the
first completion date.
* org-habit.el: Changed all "color" variables to faces, and made
them appropriate for light and dark backgrounds.
* org-habit.el (org-habit-duration-to-days): Made this function
more general.
(org-habit-parse-todo): Parse the new ".+N/N" style repeater.
* org-agenda.el (org-agenda-get-deadlines): Removed all mention of
habits, since they don't use DEADLINE anymore.
* org.el (org-repeat-re, org-display-custom-time)
(org-timestamp-change): Extended to support the new ".+N/N"
syntax, used for habits.
* org-clock.el (org-clock-resolve-clock): Fixed an incorrect
variable reference.
* org-agenda.el (org-agenda-set-mode-name): Show Habit in the
modeline when habits are being displayed (if that module is being
loaded).
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-clock.el (org-x11-idle-seconds): Add a method to get the X11
idle time using the xscreensaver extension.
(org-user-idle-seconds): Use X11 idle time if available.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-next-line): New command.
(org-agenda-previous-line): New commands.
(org-agenda-show-and-scroll-up, org-agenda-show-scroll-down): New
commands.
(org-agenda-follow-mode): Do the follow immediately if the mode is
turned on here.
(previous-line, next-line): Replace keys with the corresponding
org functions.
(org-agenda-mode-map): Bind backspace and delete to the scrolling
command.
* org.el (org-icompleting-read): Turn off partial completion mode
for the duration of this completion round.
* org-latex.el (org-export-latex-fontify-headline): Protect TeX
macros in author lines and similar stuff.
* org.el (org-file-tags): Fix docstring.
(org-get-buffer-tags): Add the #+FILETAGS tags.
("ecb"): Maks ecb show context after jumping into an Org file.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-agenda.el (org-finalize-agenda): Draw habit consistency
graphs after everything else in the buffer has been setup.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-apply): Count success and failure.
* org.el (org-indent-line-function): Fix regexp replace problem.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-clock.el (org-clock-disable-clock-resolution): New
customization variable that disable automatic clock resolution on
clock in.
(org-clock-in): If `org-clock-disable-clock-resolution' is set, do
not automatically resolve anything. This is does not affect
idle-time resolution, however, if `org-clock-idle-time' is set.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-habit.el: New file, which implements code to build a "habit
consistency graph".
* org-agenda.el (org-agenda-get-deadlines)
(org-agenda-get-scheduled): Display consistency graphs when
outputting habits into the agenda. The graphs are always relative
to the current time.
(org-format-agenda-item): Added new parameter `habitp', which
indicates whether we are formatting a habit or not. Do not
display "extra" leading information if habitp is true.
* org.el (org-repeat-re): Improved regexp to include .+ and ++
leaders for repeat strings.
(org-get-repeat): Now takes a string parameter `tagline', so the
caller can obtain the SCHEDULED repeat, or the DEADLINE repeat.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-agenda.el (org-agenda-auto-exclude-function): New
customization variable for allowing the user to create an "auto
exclusion" filter for doing context-aware auto tag filtering.
(org-agenda-filter-by-tag): Changes to support the use of
`org-agenda-auto-exclude-function'. See the new manual addition,.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org.el (org-files-list): Don't attempt to return a file name for
Org buffers which have no associated file.
* org-agenda.el (org-agenda-do-action): Fixed a typo.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-locate-entry): Interpret files
relative to org-directory.
(org-mobile-inbox-for-pull): Document the best location for this
file.
(org-mobile-check-setup): Verify `org-directory'.
(org-mobile-create-index-file): Sort the files to be listed in
index.org.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-fast-tag-selection): Add a way to display a
description for a tag group. This is done by adding a string to
either the startgroup or endgroup cell.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-resolve, org-resolve-clocks)
(org-emacs-idle-seconds): Use `org-float-time' instead of
`time-to-seconds'
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-sorting-strategy): Fix customization
type.
* org.el (org-pre-cycle-hook): Document that `empty' can also be
the value of ARG when doing local cycling.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-clock.el (org-clock-resolve-clock): If keeping or
subtracting time results in a clock out at a time in the past, and
if the resolution occurred due to idleness or invoking `M-x
org-resolve-clocks', remember that past moment in time. On the
next clock in, the user will be prompted to see if they want to
back-date their new clock to then.
(org-clock-resolve): Do not jump the user to the location of a
dangling clock if the resolution is occuring due to an idle
timeout. In that case there is typically only one dangling clock,
the active one, and there is no value gained by shuffling their
windows around to show it to them. Being prompted to resolve an
idle clock should be as inobtrusive as possible.
(org-resolve-clocks-if-idle): New function that resolves only the
currently active clock if the user has exceeded the time returned
by `org-user-idle-seconds', based on the value of
`org-clock-idle-time'.
(org-clock-in): If, after resolving clocks,
(org-clock-out): Cancel the `org-clock-idle-timer' on clock out.
* org-clock.el (org-clock-resolve-clock): New function that
resolves a clock to a specific time, closing or resuming as need
be, and possibly even starting a new clock.
(org-clock-resolve): New function used by `org-resolve-clocks'
that sets up for the call to `org-clock-resolve-clock'. It
determines the time to resolve to based on a single-character
selection from the user to either keep time, subtract away time or
cancel the clock.
(org-resolve-clocks): New user command which resolves dangling
clocks -- that is, open but not active -- anywhere in the file
list returned by `org-files-list'.
(org-clock-in): Automatically resolve dangling clocks whenever a
user clocks in.
(org-clock-cancel): If the user cancels the solely clock in a
LOGBOOK, remove the empty drawer.
* org-clock.el (org-clock-idle-time): New user customizable option
for detecting whether the user has left a clock idle. Note: it is
only used in this commit to test whether it's worthwhile to check
OS X to get the Mac user's current idle time. If the Emacs idle
time is less than the value, the user hasn't been away long enough
to be worth checking (a more expensive test than just getting
Emacs idle time).
(org-user-idle-seconds, org-mac-idle-seconds)
(org-emacs-idle-seconds): This three functions, in conjunction
with the user customization variable `org-clock-idle-time', return
the number of seconds (as a floating point) that the user has been
away from their Emacs (or, if running on OS X, their computer).
* org-clock.el (org-find-open-clocks): New function that returns a
list of all open clocks in the given FILE. Note that each clock
it returns is a cons cell of the format (MARKER . START-TIME).
This "clock" value is used by several of the new clock module
utility functions.
(org-is-active-clock): New inline function which tests whether the
given clock value is the same as the currently active clock.
Returns non-nil if this is the case.
(org-with-clock-position): New macro that evaluates FORMS with
point in the buffer and at the position of the given clock.
Changes to the current clock are global.
(org-with-clock): New macro that evaluates FORMS with point in the
buffer and at the position of the given clock. However, changes
to the current clock are local and have no effect on the user's
active clock. This allows, for example, far any clock to be
cancelled without cancelling the active clock.
(org-clock-clock-in): New inline function that switches the active
clock to the given clock. If either the argument RESUME, or the
global `org-clock-in-resume', are non-nil, it will resume a clock
that was previously left open.
(org-clock-clock-out): New inline function that clocks out the
given clock value without affecting the currently active clock.
(org-clock-clock-cancel): New inline function that cancels the
given clock value without affecting the currently active clock.
* org-clock.el (org-clock-in): Before creating
`org-clock-mode-line-timer', check to make sure an older timer is
not currently running.
(org-clock-out): Accept new third parameter `at-time', which
permits a clock to be clocked out at a specific time. Note that
no attempt is made to verify that the clock out time is later than
the clock in time.
* org.el (org-files-list): New utility function for returning a
list of all open org-mode buffers, plus all files used to build
the agenda buffer. Note that not all the files will necessarily
be visited by a buffer at time of call.
(org-entry-beginning-position): Like the function
`line-beginning-position', this inline function returns the
beginning position of the current heading/entry.
(org-entry-end-position): Like the function `line-end-position',
this inline function returns the end position of the current
heading/entry.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-list): Mark the all-todo items line as
a header line.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-inlinetask-remove-END-maybe): Declare function.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-filter-make-matcher): Allow to filter
entries that have no tags.
(org-agenda-search-view): New customize group.
(org-agenda-search-view-search-words-only): New option.
(org-search-view): Implement substring search.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-outline-level): Add doc string.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-inlinetask.el (org-inlinetask-export): Re-introduce
variable.
(org-inlinetask-export-handler): Only export inline task if the
user option calls for it.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-handle-export-tags): Remove inlinetask
END if present.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables): Don't format in
protected regions.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-edit-src-code)
(org-edit-src-find-region-and-lang, org-edit-src-exit): Handle
macro editing.
* org-agenda.el (org-prefix-category-max-length): New variable.
(org-format-agenda-item): Use `org-prefix-category-max-length'.
(org-compile-prefix-format): Set `org-prefix-category-max-length'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-create-index-file): Improve the
listing of tags and todo keywords.
* org-latex.el (org-export-latex-format-image): New function.
(org-export-latex-links): Use `org-export-latex-format-image'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-inlinetask.el (org-inlinetask-get-current-indentation)
(org-inlinetask-remove-terminator): New functions.
(org-inlinetask-export-handler): Terminate the description list.
* org-exp.el (org-export-select-backend-specific-text): Remove the
region markers.
* org-inlinetask.el (org-inlinetask-export-handler): fix bug for
tasks without content.
* org-clock.el: Make sure the clock-in target position does not
move to a different node by widening the buffer.
* org-html.el (org-export-html-format-image): Wrap image into
figure div only when there is a caption.
* org-archive.el (org-archive-mark-done): Change default value to
nil.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-context): Call `bobp', not `eobp'.
* org-clock.el (org-clock-cancel): Remove quotes from marker
variables.
* org.el (org-read-date-prefer-future): New allowed value `time'.
(org-read-date-analyze): Shift day to tomorrow depending on time
entered and value of `org-read-date-prefer-future'.
1493 lines
56 KiB
EmacsLisp
1493 lines
56 KiB
EmacsLisp
;;; org-colview.el --- Column View in Org-mode
|
|
|
|
;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
|
|
;; Free Software Foundation, Inc.
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
;; Homepage: http://orgmode.org
|
|
;; Version: 6.33
|
|
;;
|
|
;; 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-show "org-agenda" (&optional full-entry))
|
|
|
|
;;; 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 (and (eq major-mode 'org-agenda-mode)
|
|
(org-bound-and-true-p org-agenda-follow-mode)
|
|
(org-get-at-bol 'org-marker))
|
|
(org-agenda-show)))))
|
|
(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 (and (eq major-mode 'org-agenda-mode)
|
|
(org-bound-and-true-p org-agenda-follow-mode)
|
|
(org-get-at-bol 'org-marker))
|
|
(org-agenda-show)))))
|
|
(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 (org-make-overlay beg end)))
|
|
(org-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))
|
|
(pl (or (get-text-property (point-at-bol) 'prefix-length) 0))
|
|
(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"
|
|
(save-match-data
|
|
(org-no-properties
|
|
(org-remove-tabs
|
|
(buffer-substring-no-properties
|
|
(point-at-bol) (point-at-eol))))))
|
|
(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)
|
|
(org-agenda-columns-cleanup-item
|
|
val pl cphr 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)))
|
|
(org-overlay-put ov 'keymap org-columns-map)
|
|
(org-overlay-put ov 'org-columns-key property)
|
|
(org-overlay-put ov 'org-columns-value (cdr ass))
|
|
(org-overlay-put ov 'org-columns-value-modified modval)
|
|
(org-overlay-put ov 'org-columns-pom pom)
|
|
(org-overlay-put ov 'org-columns-format f))
|
|
(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)))
|
|
(org-overlay-put ov 'invisible t)
|
|
(org-overlay-put ov 'keymap org-columns-map)
|
|
(org-overlay-put ov 'intangible t)
|
|
(push ov org-columns-overlays)
|
|
(setq ov (org-make-overlay (1- (point-at-eol)) (1+ (point-at-eol))))
|
|
(org-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 'org-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)
|
|
|
|
(defvar org-agenda-columns-remove-prefix-from-item)
|
|
|
|
(defun org-agenda-columns-cleanup-item (item pl cphr fmt)
|
|
"Cleanup the time property for agenda column view.
|
|
See also the variable `org-agenda-columns-remove-prefix-from-item'."
|
|
(let* ((org-complex-heading-regexp cphr)
|
|
(prefix (substring item 0 pl))
|
|
(rest (substring item pl))
|
|
(fake (concat "* " rest))
|
|
(cleaned (org-trim (substring (org-columns-cleanup-item fake fmt) 1))))
|
|
(if org-agenda-columns-remove-prefix-from-item
|
|
cleaned
|
|
(concat prefix cleaned))))
|
|
|
|
(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))))
|
|
(t
|
|
(setq allowed (org-property-get-allowed-values pom key 'table))
|
|
(if allowed
|
|
(setq nval (org-icompleting-read "Value: " allowed nil t))
|
|
(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 'org-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 'org-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))))
|
|
"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 (org-overlay-get ov 'org-columns-key) property)
|
|
(setq pos (org-overlay-start ov))
|
|
(goto-char pos)
|
|
(when (setq val (cdr (assoc property
|
|
(get-text-property
|
|
(point-at-bol) 'org-summaries))))
|
|
(setq fmt (org-overlay-get ov 'org-columns-format))
|
|
(org-overlay-put ov 'org-columns-value val)
|
|
(org-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
|
|
((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))
|
|
(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 2 x) nil 'add_times nil '+ 'identity)
|
|
(cdr x)))
|
|
org-columns-current-fmt-compiled))
|
|
line c c1 stype calc sumfunc props lsum entries prop v)
|
|
(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)
|
|
stype (nth 3 f)
|
|
sumfunc (nth 5 f)
|
|
calc (or (nth 6 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))
|
|
""))
|
|
|
|
|
|
(provide 'org-colview)
|
|
|
|
;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
|
|
|
|
;;; org-colview.el ends here
|