Mercurial > emacs
view lisp/tempo.el @ 105973:b7d8222914b4
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* 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'.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 13 Nov 2009 08:37:55 +0000 |
parents | a9dc0e7c3f2b |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; tempo.el --- Flexible template insertion ;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Author: David K}gedal <davidk@lysator.liu.se> ;; Created: 16 Feb 1994 ;; K}gedal's last version number: 1.2.4 ;; Keywords: extensions, languages, tools ;; 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 provides a simple way to define powerful templates, or ;; macros, if you wish. It is mainly intended for, but not limited to, ;; other programmers to be used for creating shortcuts for editing ;; certain kind of documents. It was originally written to be used by ;; a HTML editing mode written by Nelson Minar <nelson@santafe.edu>, ;; and his html-helper-mode.el is probably the best example of how to ;; use this program. ;; A template is defined as a list of items to be inserted in the ;; current buffer at point. Some of the items can be simple strings, ;; while other can control formatting or define special points of ;; interest in the inserted text. ;; If a template defines a "point of interest" that point is inserted ;; in a buffer-local list of "points of interest" that the user can ;; jump between with the commands `tempo-backward-mark' and ;; `tempo-forward-mark'. If the template definer provides a prompt for ;; the point, and the variable `tempo-interactive' is non-nil, the ;; user will be prompted for a string to be inserted in the buffer, ;; using the minibuffer. ;; The template can also define one point to be replaced with the ;; current region if the template command is called with a prefix (or ;; a non-nil argument). ;; More flexible templates can be created by including lisp symbols, ;; which will be evaluated as variables, or lists, which will be ;; evaluated as lisp expressions. ;; See the documentation for tempo-define-template for the different ;; items that can be used to define a tempo template. ;; One of the more powerful features of tempo templates are automatic ;; completion. With every template can be assigned a special tag that ;; should be recognized by `tempo-complete-tag' and expanded to the ;; complete template. By default the tags are added to a global list ;; of template tags, and are matched against the last word before ;; point. But if you assign your tags to a specific list, you can also ;; specify another method for matching text in the buffer against the ;; tags. In the HTML mode, for instance, the tags are matched against ;; the text between the last `<' and point. ;; When defining a template named `foo', a symbol named ;; `tempo-template-foo' will be created whose value as a variable will ;; be the template definition, and its function value will be an ;; interactive function that inserts the template at the point. ;; The latest tempo.el distribution can be fetched from ;; ftp.lysator.liu.se in the directory /pub/emacs ;; There is also a WWW page at ;; http://www.lysator.liu.se/~davidk/elisp/ which has some information ;;; Known bugs: ;; If the 'o is the first element in a template, strange things can ;; happen when the template is inserted at the beginning of a ;; line. This is due to strange behavior in open-line. But it should ;; be easily avoided. ;; The 'o tag is also a problem when including the region. This will ;; be looked into. ;; Clicking mouse-2 in the completion buffer gives strange results. ;; There is a bug in some emacs versions that prevents completion from ;; working. If it doesn't work for you, send me a note indicating your ;; emacs version and your problems. ;;; Contributors: ;; These people have given me important feedback and new ideas for ;; tempo.el. Thanks. ;; Nelson Minar <nelson@santafe.edu> ;; Richard Stallman <rms@gnu.org> ;; Lars Lindberg <Lars.Lindberg@sypro.cap.se> ;; Glen Whitney <Glen.Whitney@math.lsa.umich.edu> ;;; Code: ;;; User options (defgroup tempo nil "Flexible template insertion." :prefix "tempo-" :group 'tools) (defcustom tempo-interactive nil "Prompt user for strings in templates. If this variable is non-nil, `tempo-insert' prompts the user for text to insert in the templates." :type 'boolean :group 'tempo) (defcustom tempo-insert-region nil "Automatically insert current region when there is a `r' in the template If this variable is nil, `r' elements will be treated just like `p' elements, unless the template function is given a prefix (or a non-nil argument). If this variable is non-nil, the behavior is reversed. In Transient Mark mode, this option is unused." :type 'boolean :group 'tempo) (defcustom tempo-show-completion-buffer t "If non-nil, show a buffer with possible completions, when only a partial completion can be found." :type 'boolean :group 'tempo) (defcustom tempo-leave-completion-buffer nil "If nil, a completion buffer generated by \\[tempo-complete-tag] disappears at the next keypress; otherwise, it remains forever." :type 'boolean :group 'tempo) ;;; Internal variables (defvar tempo-insert-string-functions nil "List of functions to run when inserting a string. Each function is called with a single arg, STRING and should return another string. This could be used for making all strings upcase by setting it to '(upcase), for example.") (defvar tempo-tags nil "An association list with tags and corresponding templates.") (defvar tempo-local-tags '((tempo-tags . nil)) "A list of locally installed tag completion lists. It is a association list where the car of every element is a symbol whose variable value is a template list. The cdr part, if non-nil, is a function or a regexp that defines the string to match. See the documentation for the function `tempo-complete-tag' for more info. `tempo-tags' is always in the last position in this list.") (defvar tempo-collection nil "A collection of all the tags defined for the current buffer.") (defvar tempo-dirty-collection t "Indicates if the tag collection needs to be rebuilt.") (defvar tempo-marks nil "A list of marks to jump to with `\\[tempo-forward-mark]' and `\\[tempo-backward-mark]'.") (defvar tempo-match-finder "\\b\\([[:word:]]+\\)\\=" "The regexp or function used to find the string to match against tags. If `tempo-match-finder' is a string, it should contain a regular expression with at least one \\( \\) pair. When searching for tags, `tempo-complete-tag' calls `re-search-backward' with this string, and the string between the first \\( and \\) is used for matching against each string in the tag list. If one is found, the whole text between the first \\( and the point is replaced with the inserted template. You will probably want to include \\=\\= at the end of the regexp to make sure that the string is matched only against text adjacent to the point. If `tempo-match-finder' is a symbol, it should be a function that returns a pair of the form (STRING . POS), where STRING is the string used for matching and POS is the buffer position after which text should be replaced with a template.") (defvar tempo-user-elements nil "Element handlers for user-defined elements. A list of symbols which are bound to functions that take one argument. This function should return something to be sent to `tempo-insert' if it recognizes the argument, and nil otherwise.") (defvar tempo-named-insertions nil "Temporary storage for named insertions.") (defvar tempo-region-start (make-marker) "Region start when inserting around the region.") (defvar tempo-region-stop (make-marker) "Region stop when inserting around the region.") ;; Make some variables local to every buffer (make-variable-buffer-local 'tempo-marks) (make-variable-buffer-local 'tempo-local-tags) (make-variable-buffer-local 'tempo-match-finder) (make-variable-buffer-local 'tempo-collection) (make-variable-buffer-local 'tempo-dirty-collection) ;;; Functions ;; ;; tempo-define-template (defun tempo-define-template (name elements &optional tag documentation taglist) "Define a template. This function creates a template variable `tempo-template-NAME' and an interactive function `tempo-template-NAME' that inserts the template at the point. The created function is returned. NAME is a string that contains the name of the template, ELEMENTS is a list of elements in the template, TAG is the tag used for completion, DOCUMENTATION is the documentation string for the insertion command created, and TAGLIST (a symbol) is the tag list that TAG (if provided) should be added to. If TAGLIST is nil and TAG is non-nil, TAG is added to `tempo-tags'. The elements in ELEMENTS can be of several types: - A string: It is sent to the hooks in `tempo-insert-string-functions', and the result is inserted. - The symbol `p': This position is saved in `tempo-marks'. - The symbol `r': If `tempo-insert' is called with ON-REGION non-nil the current region is placed here. Otherwise it works like `p'. - (p PROMPT <NAME> <NOINSERT>): If `tempo-interactive' is non-nil, the user is prompted in the minibuffer with PROMPT for a string to be inserted. If the optional parameter NAME is non-nil, the text is saved for later insertion with the `s' tag. If there already is something saved under NAME that value is used instead and no prompting is made. If NOINSERT is provided and non-nil, nothing is inserted, but text is still saved when a NAME is provided. For clarity, the symbol `noinsert' should be used as argument. - (P PROMPT <NAME> <NOINSERT>): Works just like the previous tag, but forces `tempo-interactive' to be true. - (r PROMPT <NAME> <NOINSERT>): Like the previous tag, but if `tempo-interactive' is nil and `tempo-insert' is called with ON-REGION non-nil, the current region is placed here. This usually happens when you call the template function with a prefix argument. - (s NAME): Inserts text previously read with the (p ..) construct. Finds the insertion saved under NAME and inserts it. Acts like `p' if tempo-interactive is nil. - `&': If there is only whitespace between the line start and point, nothing happens. Otherwise a newline is inserted. - `%': If there is only whitespace between point and end of line, nothing happens. Otherwise a newline is inserted. - `n': Inserts a newline. - `>': The line is indented using `indent-according-to-mode'. Note that you often should place this item after the text you want on the line. - `r>': Like `r', but it also indents the region. - (r> PROMPT <NAME> <NOINSERT>): Like (r ...), but is also indents the region. - `n>': Inserts a newline and indents line. - `o': Like `%' but leaves the point before the newline. - nil: It is ignored. - Anything else: It is evaluated and the result is treated as an element to be inserted. One additional tag is useful for these cases. If an expression returns a list '(l foo bar), the elements after `l' will be inserted according to the usual rules. This makes it possible to return several elements from one expression." (let* ((template-name (intern (concat "tempo-template-" name))) (command-name template-name)) (set template-name elements) (fset command-name (list 'lambda (list '&optional 'arg) (or documentation (concat "Insert a " name ".")) (list 'interactive "*P") (list 'tempo-insert-template (list 'quote template-name) (list 'if 'tempo-insert-region (list 'not 'arg) 'arg)))) (and tag (tempo-add-tag tag template-name taglist)) command-name)) ;;; ;;; tempo-insert-template (defun tempo-insert-template (template on-region) "Insert a template. TEMPLATE is the template to be inserted. If ON-REGION is non-nil the `r' elements are replaced with the current region. In Transient Mark mode, ON-REGION is ignored and assumed true if the region is active." (unwind-protect (progn (if (or (and (boundp 'transient-mark-mode) ; For Emacs transient-mark-mode mark-active) (if (featurep 'xemacs) (and zmacs-regions (mark)))) (setq on-region t)) (and on-region (set-marker tempo-region-start (min (mark) (point))) (set-marker tempo-region-stop (max (mark) (point)))) (if on-region (goto-char tempo-region-start)) (save-excursion (tempo-insert-mark (point-marker)) (mapc (function (lambda (elt) (tempo-insert elt on-region))) (symbol-value template)) (tempo-insert-mark (point-marker))) (tempo-forward-mark)) (tempo-forget-insertions) ;; Should I check for zmacs here too??? (and (boundp 'transient-mark-mode) transient-mark-mode (deactivate-mark)))) ;;; ;;; tempo-insert (defun tempo-insert (element on-region) "Insert a template element. Insert one element from a template. If ON-REGION is non-nil the `r' elements are replaced with the current region. See documentation for `tempo-define-template' for the kind of elements possible." (cond ((stringp element) (tempo-process-and-insert-string element)) ((and (consp element) (eq (car element) 'p)) (tempo-insert-prompt-compat (cdr element))) ((and (consp element) (eq (car element) 'P)) (let ((tempo-interactive t)) (tempo-insert-prompt-compat (cdr element)))) ;;; ((and (consp element) ;;; (eq (car element) 'v)) (tempo-save-named ;;; (nth 1 element) ;;; nil ;;; (nth 2 element))) ((and (consp element) (eq (car element) 'r)) (if on-region (goto-char tempo-region-stop) (tempo-insert-prompt-compat (cdr element)))) ((and (consp element) (eq (car element) 'r>)) (if on-region (progn (goto-char tempo-region-stop) (indent-region (mark) (point) nil)) (tempo-insert-prompt-compat (cdr element)))) ((and (consp element) (eq (car element) 's)) (tempo-insert-named (car (cdr element)))) ((and (consp element) (eq (car element) 'l)) (mapcar (function (lambda (elt) (tempo-insert elt on-region))) (cdr element))) ((eq element 'p) (tempo-insert-mark (point-marker))) ((eq element 'r) (if on-region (goto-char tempo-region-stop) (tempo-insert-mark (point-marker)))) ((eq element 'r>) (if on-region (progn (goto-char tempo-region-stop) (indent-region (mark) (point) nil)) (tempo-insert-mark (point-marker)))) ((eq element '>) (indent-according-to-mode)) ((eq element '&) (if (not (or (= (current-column) 0) (save-excursion (re-search-backward "^\\s-*\\=" nil t)))) (insert "\n"))) ((eq element '%) (if (not (or (eolp) (save-excursion (re-search-forward "\\=\\s-*$" nil t)))) (insert "\n"))) ((eq element 'n) (insert "\n")) ((eq element 'n>) (insert "\n") (indent-according-to-mode)) ;; Bug: If the 'o is the first element in a template, strange ;; things can happen when the template is inserted at the ;; beginning of a line. ((eq element 'o) (if (not (or on-region (eolp) (save-excursion (re-search-forward "\\=\\s-*$" nil t)))) (open-line 1))) ((null element)) (t (tempo-insert (or (tempo-is-user-element element) (eval element)) on-region)))) ;;; ;;; tempo-insert-prompt (defun tempo-insert-prompt-compat (prompt) "Compatibility hack for `tempo-insert-prompt'. PROMPT can be either a prompt string, or a list of arguments to `tempo-insert-prompt', or nil." (if (consp prompt) ; not nil either (apply 'tempo-insert-prompt prompt) (tempo-insert-prompt prompt))) (defun tempo-insert-prompt (prompt &optional save-name no-insert) "Prompt for a text string and insert it in the current buffer. If the variable `tempo-interactive' is non-nil the user is prompted for a string in the minibuffer, which is then inserted in the current buffer. If `tempo-interactive' is nil, the current point is placed on `tempo-mark'. PROMPT is the prompt string, SAVE-NAME is a name to save the inserted text under. If the optional argument NO-INSERT is non-nil, no text is inserted. This can be useful when there is a SAVE-NAME. If there already is a value for SAVE-NAME, it is used and the user is never prompted." (let (insertion (previous (and save-name (tempo-lookup-named save-name)))) (cond ;; Insert previous value, unless no-insert is non-nil ((and previous (not no-insert)) (tempo-insert-named save-name)) ; A double lookup here, but who ; cares ;; If no-insert is non-nil, don't insert the previous value. Just ;; keep it (previous nil) ;; No previous value. Prompt or insert mark (tempo-interactive (if (not (stringp prompt)) (error "tempo: The prompt (%s) is not a string" prompt)) (setq insertion (read-string prompt)) (or no-insert (insert insertion)) (if save-name (tempo-save-named save-name insertion))) (t (tempo-insert-mark (point-marker)))))) ;;; ;;; tempo-is-user-element (defun tempo-is-user-element (element) "Tries all the user-defined element handlers in `tempo-user-elements'." ;; Sigh... I need (some list) (catch 'found (mapc (function (lambda (handler) (let ((result (funcall handler element))) (if result (throw 'found result))))) tempo-user-elements) (throw 'found nil))) ;;; ;;; tempo-forget-insertions (defun tempo-forget-insertions () "Forget all the saved named insertions." (setq tempo-named-insertions nil)) ;;; ;;; tempo-save-named (defun tempo-save-named (name data) ; Had an optional prompt for 'v "Save some data for later insertion The contents of DATA is saved under the name NAME. The data can later be retrieved with `tempo-lookup-named'. This function returns nil, so it can be used in a template without inserting anything." (setq tempo-named-insertions (cons (cons name data) tempo-named-insertions)) nil) ;;; ;;; tempo-lookup-named (defun tempo-lookup-named (name) "Lookup some saved data under the name NAME. Returns the data if NAME was found, and nil otherwise." (cdr (assq name tempo-named-insertions))) ;;; ;;; tempo-insert-named (defun tempo-insert-named (name) "Insert the previous insertion saved under a named specified in NAME. If there is no such name saved, a tempo mark is inserted. Note that if the data is a string, it will not be run through the string processor." (let* ((insertion (tempo-lookup-named name))) (cond ((null insertion) (tempo-insert-mark (point-marker))) ((stringp insertion) (insert insertion)) (t (tempo-insert insertion nil))))) ;;; ;;; tempo-process-and-insert-string (defun tempo-process-and-insert-string (string) "Insert a string from a template. Run a string through the preprocessors in `tempo-insert-string-functions' and insert the results." (cond ((null tempo-insert-string-functions) nil) ((symbolp tempo-insert-string-functions) (setq string (funcall tempo-insert-string-functions string))) ((listp tempo-insert-string-functions) (dolist (fn tempo-insert-string-functions) (setq string (funcall fn string)))) (t (error "Bogus value in tempo-insert-string-functions: %s" tempo-insert-string-functions))) (insert string)) ;;; ;;; tempo-insert-mark (defun tempo-insert-mark (mark) "Insert a mark `tempo-marks' while keeping it sorted." (cond ((null tempo-marks) (setq tempo-marks (list mark))) ((< mark (car tempo-marks)) (setq tempo-marks (cons mark tempo-marks))) (t (let ((lp tempo-marks)) (while (and (cdr lp) (<= (car (cdr lp)) mark)) (setq lp (cdr lp))) (if (not (= mark (car lp))) (setcdr lp (cons mark (cdr lp)))))))) ;;; ;;; tempo-forward-mark (defun tempo-forward-mark () "Jump to the next mark in `tempo-forward-mark-list'." (interactive) (let ((next-mark (catch 'found (mapc (function (lambda (mark) (if (< (point) mark) (throw 'found mark)))) tempo-marks) ;; return nil if not found nil))) (if next-mark (goto-char next-mark)))) ;;; ;;; tempo-backward-mark (defun tempo-backward-mark () "Jump to the previous mark in `tempo-back-mark-list'." (interactive) (let ((prev-mark (catch 'found (let (last) (mapc (function (lambda (mark) (if (<= (point) mark) (throw 'found last)) (setq last mark))) tempo-marks) last)))) (if prev-mark (goto-char prev-mark)))) ;;; ;;; tempo-add-tag (defun tempo-add-tag (tag template &optional tag-list) "Add a template tag. Add the TAG, that should complete to TEMPLATE to the list in TAG-LIST, or to `tempo-tags' if TAG-LIST is nil." (interactive "sTag: \nCTemplate: ") (if (null tag-list) (setq tag-list 'tempo-tags)) (if (not (assoc tag (symbol-value tag-list))) (set tag-list (cons (cons tag template) (symbol-value tag-list)))) (tempo-invalidate-collection)) ;;; ;;; tempo-use-tag-list (defun tempo-use-tag-list (tag-list &optional completion-function) "Install TAG-LIST to be used for template completion in the current buffer. TAG-LIST is a symbol whose variable value is a tag list created with `tempo-add-tag'. COMPLETION-FUNCTION is an obsolete option for specifying an optional function or string that is used by `\\[tempo-complete-tag]' to find a string to match the tag against. It has the same definition as the variable `tempo-match-finder'. In this version, supplying a COMPLETION-FUNCTION just sets `tempo-match-finder' locally." (let ((old (assq tag-list tempo-local-tags))) (if old (setcdr old completion-function) (setq tempo-local-tags (cons (cons tag-list completion-function) tempo-local-tags)))) (if completion-function (setq tempo-match-finder completion-function)) (tempo-invalidate-collection)) ;;; ;;; tempo-invalidate-collection (defun tempo-invalidate-collection () "Marks the tag collection as obsolete. Whenever it is needed again it will be rebuilt." (setq tempo-dirty-collection t)) ;;; ;;; tempo-build-collection (defun tempo-build-collection () "Build a collection of all the tags and return it. If `tempo-dirty-collection' is nil, the old collection is reused." (prog1 (or (and (not tempo-dirty-collection) tempo-collection) (setq tempo-collection (apply (function append) (mapcar (function (lambda (tag-list) ; If the format for ; tempo-local-tags changes, ; change this (eval (car tag-list)))) tempo-local-tags)))) (setq tempo-dirty-collection nil))) ;;; ;;; tempo-find-match-string (defun tempo-find-match-string (finder) "Find a string to be matched against a tag list. FINDER is a function or a string. Returns (STRING . POS), or nil if no reasonable string is found." (cond ((stringp finder) (let (successful) (save-excursion (or (setq successful (re-search-backward finder nil t)) 0)) (if successful (cons (buffer-substring (match-beginning 1) (match-end 1)) ; This seems to be a ; bug in emacs (match-beginning 1)) nil))) (t (funcall finder)))) ;;; ;;; tempo-complete-tag (defun tempo-complete-tag (&optional silent) "Look for a tag and expand it. All the tags in the tag lists in `tempo-local-tags' \(this includes `tempo-tags') are searched for a match for the text before the point. The way the string to match for is determined can be altered with the variable `tempo-match-finder'. If `tempo-match-finder' returns nil, then the results are the same as no match at all. If a single match is found, the corresponding template is expanded in place of the matching string. If a partial completion or no match at all is found, and SILENT is non-nil, the function will give a signal. If a partial completion is found and `tempo-show-completion-buffer' is non-nil, a buffer containing possible completions is displayed." ;; This function may look like a hack, but this is how I want it to ;; work. (interactive "*") (let* ((collection (tempo-build-collection)) (match-info (tempo-find-match-string tempo-match-finder)) (match-string (car match-info)) (match-start (cdr match-info)) (exact (assoc match-string collection)) (compl (or (car exact) (and match-info (try-completion match-string collection))))) (if compl (delete-region match-start (point))) (cond ((null match-info) (or silent (ding))) ((null compl) (or silent (ding))) ((eq compl t) (tempo-insert-template (cdr (assoc match-string collection)) nil)) (t (if (setq exact (assoc compl collection)) (tempo-insert-template (cdr exact) nil) (insert compl) (or silent (ding)) (if tempo-show-completion-buffer (tempo-display-completions match-string collection))))))) ;;; ;;; tempo-display-completions (defun tempo-display-completions (string tag-list) "Show a buffer containing possible completions for STRING." (if tempo-leave-completion-buffer (with-output-to-temp-buffer "*Completions*" (display-completion-list (all-completions string tag-list) string)) (save-window-excursion (with-output-to-temp-buffer "*Completions*" (display-completion-list (all-completions string tag-list) string)) (sit-for 32767)))) ;;; ;;; tempo-expand-if-complete (defun tempo-expand-if-complete () "Expand the tag before point if it is complete. Returns non-nil if an expansion was made and nil otherwise. This could as an example be used in a command that is bound to the space bar, and looks something like this: \(defun tempo-space () (interactive \"*\") (or (tempo-expand-if-complete) (insert \" \")))" (interactive "*") (let* ((collection (tempo-build-collection)) (match-info (tempo-find-match-string tempo-match-finder)) (match-string (car match-info)) (match-start (cdr match-info)) (exact (assoc match-string collection))) (if exact (progn (delete-region match-start (point)) (tempo-insert-template (cdr exact) nil) t) nil))) (provide 'tempo) ;; arch-tag: b3c0ee36-db3b-47bc-875f-091b4e27a063 ;;; tempo.el ends here