mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-16 19:00:55 -08:00
ed21c5c84c
* org.el (org-insert-link): Find the link buffer on visible
frames.
(org-export-latex-default-packages-alist): hyperref must be loaded
late.
(org-open-file): More care with the new matching for file links.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Do not yet protect
defined entities - these will be taken care of later.
(org-export-latex-special-chars): Post-process entity replacement.
(org-export-latex-fontify-headline): Do not yet protect defined
entities - these will be taken care of later.
(org-export-latex-tables, org-export-latex-links): Format the
caption properly.
* org-entities.el (org-entities-user): Fix typo.
* org.el (org-prepare-agenda-buffers): Uniquify TODO keywords
* org-entities.el (org-entities-user): Improve docstring.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-entities.el (org-macs): Require org-macs, to be sure that we
have `declare-function' defined.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-classes): Update docstring.
* org.el (org-format-latex-header): Add cookies to the header.
(org-splice-latex-header): Implement placement according to
cookies.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-aux-preprocess): Control case
sensitivity.
2010-04-10 Bastien Guerry <bzg@altern.org>
* org.el (org-splice-latex-header): Fix typo.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Use
`org-splice-latex-header' to build the header.
(org-export-latex-classes): Update docstring.
* org.el (org-splice-latex-header): New function.
(org-create-formula-image): Use `org-splice-latex-header' to build
the header.
* org-gnus.el (org-gnus-follow-link): Handle nndoc backend.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-export-latex-packages-alist)
(org-export-latex-default-packages-alist): Fix docstring to
reflect the expected structure.
* org-docbook.el (org-docbook-do-expand): Fix bug with variable names.
(org-export-docbook-finalize-table): Make use of label for tables.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-attach.el (org-attach-commit): Split on newlines.
* org.el (org-export-latex-default-packages-alist): Use list
instead of cons for the entries.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-entities.el (org-entity-get-representation): Catch the case
that there is not entry in the list.
* org-mobile.el (org-mobile-use-encryption)
(org-mobile-encryption-tempfile, org-mobile-encryption-password):
New options.
(org-mobile-check-setup): CHeck the encryption setup.
(org-mobile-copy-agenda-files, org-mobile-sumo-agenda-command)
(org-mobile-create-sumo-agenda): Use encryption code.
(org-mobile-encrypt-and-move): New function.
(org-mobile-encrypt-file, org-mobile-decrypt-file): New
functions.
(org-mobile-move-capture): Decrypt the capture file.
* org.el (org-entities): Require the new file.
(org-export-latex-default-packages-alist): New variable.
(org-complete): Use new entity code for completion.
(org-create-formula-image): Use the new packages variable.
* org-latex.el (org-export-latex-classes): Remove the standard
packages from the class headers.
(org-export-latex-make-header): Use the new package variable.
(org-export-latex-special-chars): Better regexp for entities, to
support entity name that contain numbers.
(org-export-latex-treat-backslash-char): Use the new entity code.
* org-html.el (org-html-do-expand): Use the new entity code.
* org-exp.el (org-export): Add the new export commands.
(org-html-entities): Constant removed.
(org-export-visible): Add the new export commands.
* org-entities.el: New file.
* org-docbook.el (org-docbook-do-expand): Use new entity code.
* org-ascii.el (org-export-ascii-entities): New variable.
(org-export-as-latin1, org-export-as-latin1-to-buffer)
(org-export-as-utf8, org-export-as-utf8-to-buffer): New commands.
(org-export-as-encoding): New function.
(org-export-ascii-preprocess): Call `org-ascii-replace-entities'.
(org-ascii-replace-entities): New function.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-html-level-start): Catch the case that target
might be nil.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org.el (org-appearance): Change Customize group variable name
from org-font-lock to org-appearance, and change tag from "Org
Font Lock" to "Org Appearance"
(org-odd-levels-only): Change Customize group variable name
(org-level-color-stars-only): Change Customize group variable name
(org-hide-leading-stars): Change Customize group variable name
(org-hidden-keywords): Change Customize group variable name
(org-fontify-done-headline): Change Customize group variable name
(org-fontify-emphasized-text): Change Customize group variable name
(org-fontify-whole-heading-line): Change Customize group variable name
(org-highlight-latex-fragments-and-specials): Change Customize
group variable name
(org-hide-emphasis-markers): Change Customize group variable name
(org-emphasis-alist): Change Customize group variable name
(org-emphasis-regexp-components): Change Customize group variable
name
(org-modules): Remove mention of org-R
* org-faces.el (org-faces): Change Customize group variable name
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-diary-last-run-time): New variable.
(org-diary): prepare agenda buffers only if last call was some
time ago.
* org-html.el (org-export-html-preprocess): Replace \ref macros
with a link.
(org-format-org-table-html): Add the label as an anchor.
* org-docbook.el (org-export-docbook-format-image): Do some
formatting on captions.
* org-latex.el (org-export-latex-tables, org-export-latex-links):
Do some formatting on captions.
* org-html.el (org-export-html-format-image)
(org-format-org-table-html): Do some formatting on captions.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org.el (org-hidden-keywords): New customizable variable. This is
a list of symbols specifying which of the special keywords #+DATE,
#+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock.
(org-fontify-meta-lines-and-blocks): Changes to font-lock code
implementing new faces and hiding behaviour.
* org-faces.el (org-document-title): New face for #+TITLE lines
(org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines
(org-document-info-keyword): New face for #+DATE, #+AUTHOR, #+EMAIL keywords
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-sanitize-plist): New function to
rename "index" properties to "sitemap". Do this renaming
globally.
(org-publish-with-aux-preprocess-maybe): New macro.
(org-publish-org-to-pdf, org-publish-org-to-html): Use the new
macro.
(org-publish-aux-preprocess)
(org-publish-index-generate-theindex.inc): New function.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-align): Interpret <N> at fixed width,
not as maximum width.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-author-info, org-export-email-info): Fix
docstrings.
* org-beamer.el (org-beamer-select-environment): Renamed from
`org-beamer-set-environment-tag'. Improve docstring.
* org-freemind.el (org-freemind-write-mm-buffer): Fix another
problem with odd levels.
* org-ascii.el (org-export-as-ascii): Export email only if the
author wants it.
* org-docbook.el (org-export-as-docbook): Export email only if the
author wants it.
* org-html.el (org-export-as-html): Export email only if the
author wants it.
* org-exp.el (org-export-email-info): New option.
(org-export-plist-vars): Add entry for `org-export-email'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-goto-line): Fix typo.
2010-04-10 Mikael Fornius <mfo@abc.se>
* org.el (org-agenda-files): Typo.
(org-read-agenda-file-list): Add optional argument to help
`org-store-new-agenda-file-list' to remember un-expanded file
names. Expand file names relative to `org-directory'.
(org-store-new-agenda-file-list): Keep un-expanded file names when
saving, if available.
(org-agenda-files): Update documentation.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-ascii.el (org-export-as-ascii): Catch the case of exporting
a buffer with no file name attached.
* org.el (org-log-refile): New option.
(org-log-note-headings): Add a heading for refiling.
(org-startup-options): Add keywords for logging of the refile
action.
(org-refile): Add logging action.
(org-add-log-note): Allow for refiling action.
* org-agenda.el (org-agenda-bulk-action): Make sure
`org-log-refile' is not `note' during a bulk action.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-map-dblocks): Use save-excursion to remember the
position.
* org-attach.el (org-attach-commit): Remove dependence on xargs.
(org-attach-delete-one): Commit after deleting a file.
* org-latex.el (org-export-latex-fontify): Do not mistake table.el
borders for strike-through emphasis.
* org-freemind.el (org-freemind-write-mm-buffer): Simplify the
handling of odd levels.
* org-agenda.el (org-agenda-todo-ignore-deadlines): Document `past'
and `future' values.
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
Handle `past' and `future' values.
* org.el (org-read-agenda-file-list): Interpret file names
relative to org-directory and allow environment variables and
"~".
* org-latex.el (org-export-latex-special-chars): Allow a
parenthesis before an exponent or subscript.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-edit-src-exit): When returning from code edit
buffer, if code block is hidden, leave point at start of
#+begin_src line
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-insert-heading): Do not remove all spaces if the
headline is empty.
* org-indent.el (org-indent): Fix group name.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-goto-column): Fix forcing a non-existing
column.
(org-table-get, org-table-put, org-table-goto-line)
(org-table-current-line): New functions.
2010-04-10 Jan Böcker <jan.boecker@jboecker.de>
* org.el (org-open-file): Allow regular expressions in
org-file-apps to capture link parameters using groups. In a
command string to be executed, the parameters can be referenced
using %1, %2, etc. Lisp forms can access them using
(match-string n link).
(org-apps-regexp-alist): Adopt the created regexp, as this is now
matched against a file: link instead of the file name.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-crypt.el (org-reveal-start-hook): Add a decryption function
to this hook.
(org-decrypt-entries, org-encrypt-entries, org-decrypt-entry): Add
docstrings.
* org.el (org-point-at-end-of-empty-headline)
(org-level-increment, org-get-previous-line-level): New function.
(org-cycle-level): Rewritten to be independent of when this
function is called.
(org-in-regexps-block-p): New function.
(org-reveal-start-hook): New hook.
(org-reveal): Run new hook.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-keywords): Start a new paragraph
after time keywords, do not add "\newline".
* org-html.el (org-export-as-html): Avoid double # in href.
* org.el (org-refile-get-location): Catch an invalid target
specification.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Make sure the behavior regarding to extracting time is
consistent.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org-agenda.el (org-agenda-insert-diary-extract-time): New
variable.
(org-agenda-add-entry-to-org-agenda-diary-file): Use this new
variable rather than `org-agenda-search-headline-for-time'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-fix-bullet-type): Improve cursor positioning.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-adaptive-fill-regexp-backup): New variable.
(org-set-autofill-regexps): Store a backup of
`adaptive-fill-regexp'.
(org-adaptive-fill-function): Fix filling of comments and ordered
lists. If there is no other match, till try adaptive fill.
2010-04-10 John Wiegley <jwiegley@gmail.com>
* org-agenda.el (org-agenda-include-deadlines): Added new
customization variable to determine whether unscheduled tasks
should appear in the agenda solely because of their deadline.
Default to true, which was the previous behavior (it just wasn't
configurable).
(org-agenda-mode-map, org-agenda-view-mode-dispatch): Bind ! in
the agenda to show/hide deadline tasks.
(org-agenda-menu): Added menu option for show/hide deadlines.
(org-agenda-list): Make the agenda list sensitive to the value of
`org-agenda-include-deadlines'.
(org-agenda-toggle-deadlines): New function to toggle the value of
`org-agenda-include-deadlines' and repaint the modeline
indicators.
(org-agenda-set-mode-name): Show "Deadlines" in the agenda
modeline if deadline tasks are being displayed.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-eval-formula): Replace $# and @# by
current column and row number.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-property, org-delete-property): Go back to
prompting for the property.
* org-latex.el (org-export-latex-make-header): Fully process
author line.
(org-export-latex-fontify-headline): Allow several arguments, not
just one.
(org-export-latex-fix-inputenc): Catch the error when
`latexenc-coding-system-to-inputenc' is not defined.
* org-agenda.el (org-agenda-skip-if-todo): New function.
(org-agenda-skip-if): Add conditions for TODO keywords.
(org-agenda-skip-if): Document the new todo conditions.
2010-04-10 Mikael Fornius <mfo@abc.se>
* org.el (org-at-property-p): Check if we are inside a property
drawer not just any drawer.
(org-set-property, org-delete-property): When cursor is on a
property key value pair do not prompt for property name instead
use name at cursor.
(org-ctrl-c-ctrl-c): Still do org-property-action when cursor is
on the first line of a property drawer.
(org-property-end-re): Spell check.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-attach-captions-and-attributes): Add the
properties to the entire table, in case the first line is
removed.
* org-archive.el (org-archive-reversed-order): New option.
(org-archive-subtree, org-archive-to-archive-sibling): Use the new
option `org-archive-reversed-order'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-entry-types): New variable.
(org-agenda-list): Use `org-agenda-entry-types'.
(org-agenda-custom-commands-local-options): Support for setting
`org-agenda-entry-types' as an option.
(org-diary): Shift some documentation from here to the variable
`org-agenda-entry-types'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Apply macros in
author field.
* org-clock.el (org-clocking-buffer, org-clocking-p): New function.
(org-clock-select-task, org-clock-notify-once-if-expired)
(org-clock-in, org-clock-out, org-clock-cancel, org-clock-goto)
(org-clock-out-if-current, org-clock-save): Use the new functions.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-docbook.el (org-export-as-docbook): Remove unnecessary
newline.
(org-export-as-docbook): Remove unnecessary newline.
(org-export-as-docbook): Fix problem with double footnote
reference in one place.
* org-exp.el (org-export-format-source-code-or-example): Remove
unnecessary newline.
* org.el (org-deadline, org-schedule): Allow rescheduling entries
with repeaters.
* org-table.el (org-table-convert-refs-to-rc): Better way to catch
function calls that look like references.
* org.el (org-open-at-point): Get link abbreviations from
reference buffer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-convert-refs-to-rc): Do not read arctan2
as a reference.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-link-unescape): Solve issue with lower-case escapes.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-classes): Add
\usepackage{latexsym} to all classes.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-as-html): Do not allow protected lines
into the table of contents.
* org-latex.el (org-export-latex-special-chars): Find subsequent
occurrences of special characters.
(org-export-latex-tables): Do not convert table-like stuff that is
protected.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-toggle-checkbox): No errors when updating
checkbox count fails because there is no heading.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-report-include-clocking-task): New
option.
(org-clock-sum): Add the current clocking task.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-cycle): Print a message when in a table.el table.
(org-edit-special): Recognize the table.el context.
(org-ctrl-c-ctrl-c): Print a message when in a table.el table.
* org-src.el (org-at-table.el-p): Declare.
(org-edit-src-code): Handle a special case for table.el editing.
(org-edit-src-find-region-and-lang): Recognize the table.el
context.
* org-latex.el (org-export-latex-tables): Convert table.el
tables.
(org-export-latex-convert-table.el-table): New function.
* org-html.el (org-html-expand): Fix table.el export.
* org-latex.el (org-export-latex-preprocess): Protect footnotes in
headings.
* org-id.el (org-id-find-id-file): Fix bug when there is no hash
table for the id locations.
* org.el (org-read-date-analyze): Match American-style dates, like
5/30 or 5/13/7. Make sure cal-iso.el is loaded. Don't force he
current year when reading ISO and American dates.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-face-from-face-or-color): New function.
(org-get-todo-face, org-font-lock-add-priority-faces)
(org-get-tag-face): Use `org-face-from-face-or-color'.
* org-faces.el (org-todo-keyword-faces, org-priority-faces): Allow
simple colors as values.
(org-faces-easy-properties): New option.
* org-agenda.el (org-agenda-set-mode-name): Show if the agenda is
restricted, as an agenda mode.
(org-agenda-fontify-priorities): Allow simple colors as values.
2010-04-10 Bastien Guerry <bzg@altern.org>
* org-timer.el (org-timer-current-timer): Renamed from
`org-timer-last-timer'.
(org-timer-timer1, org-timer-timer2, org-timer-timer3): Removed.
(org-timer-cancel-timer, org-timer-show-remaining-time)
(org-timer-set-timer): Update to use only one timer.
* org.el (org-set-property): Remove useless space in the prompt.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-html-style-default): Add a default style
for textareas.
* org-exp.el (org-export-format-source-code-or-example): Fix
textarea tag.
2010-04-10 Bastien Guerry <bzg@altern.org>
* org-clock.el (org-clock-current-task): New variable to store
last clocked in task.
(org-clock-set-current, org-clock-delete-current): New functions.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-apply-template): Extend comment.
(org-remember-handler): Implement clock sibling filing.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-all, org-publish-current-file)
(org-publish-current-project): When called with prefix argument
FORCE, also rebuild the validation file list.
* org-latex.el (org-export-latex-preprocess): Protect footnotes in
section headings.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-as-html-and-open): Kill product buffer
if the user wants that.
* org-latex.el (org-export-as-pdf-and-open): Kill product buffer
if the user wants that.
* org-exp.el (org-export-kill-product-buffer-when-displayed): New
option.
* org-agenda.el (org-batch-agenda-csv): Use the time property
instead of the `time-of-day' property.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-start-hook, org-timer-stop-hook)
(org-timer-pause-hook, org-timer-set-hook)
(org-timer-cancel-hook): New hooks.
(org-timer-start): Run `org-timer-start-hook'.
(org-timer-pause-or-continue): Run `org-timer-pause-hook'.
(org-timer-stop): Run `org-timer-stop-hook'.
(org-timer-cancel-timers): Run `org-timer-cancel-hook'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-reveal): Double prefix arg shows the subtree of the
parent.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-search-view): Fix bug with searching full
words in headlines in search view.
(org-agenda-skip-deadline-prewarning-if-scheduled): New option.
(org-agenda-get-deadlines): Suppress pre-warning if the entry is
scheduled (if the user configures it so.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-hide-archived-subtrees): Don't jump to end of
subtree if the match was not in a headline.
(org-inside-latex-macro-p): Allow more complex arguments.
(org-emphasize): Protect against use at end of buffer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-align-tags): Avoid side effects on
text properties.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-todo-ignore-scheduled): More allowed
values.
(org-agenda-todo-ignore-scheduled)
(org-agenda-todo-ignore-deadlines): More control with different
allowed values.
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
Honor the new option settings.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-get-location): Make sure the selection buffer is
shown in the current frame.
* org-ascii.el (org-export-ascii-table-widen-columns): New
option.
(org-export-ascii-preprocess): Realign tables to remove narrowing
if `org-export-ascii-table-widen-columns' is set.
* org-table.el (org-table-do-narrow): New variable.
(org-table-align): Narrow only if `org-table-do-narrow' is t.
* org.el (org-deadline, org-schedule): Allow updating if the
relevant time stamp does not have a repeater, i.e. do not require
that no time stamp has a repeater.
* org-agenda.el (org-agenda-align-tags): Don't add a face to the
new white space before the tags.
* org-latex.el (org-export-as-latex): Do nit require the buffer to
be visiting a file when only exporting to a buffer or string.
(org-export-latex-fix-inputenc): Only save the buffer is there is
a file name attached to it.
2010-04-10 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-edit-src-exit): Widen before exiting edit buffers
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-fontify-meta-lines-and-blocks): Honor
`org-fontify-quote-and-verse-blocks'.
* org-faces.el (org-fontify-quote-and-verse-blocks): New option.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-at-point): Also check for text property
org-linked-text before offering collected links.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Optionally extract time specification from text and add to the
timestamp.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-html-entities): Fix typo.
* org-latex.el (org-export-latex-make-header): Use \providecommand
to make sure the \alert macro is defined.
* org.el (org-format-latex-signal-error)
(org-create-formula-image): Use `org-format-latex-signal-error'.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org.el (org-store-link): For dired buffers, use
default-directory as link name if dired-get-filename returns
nil.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-concatenate-multiline-links): The for
protectedness at beginning of match.
* org-latex.el (org-export-latex-fix-inputenc): Never leave the
AUTO as a coding system, instead default to utf8.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-block-todo-from-children-or-siblings-or-parent)
(org-block-todo-from-checkboxes): Respect the local variable
value when deciding if blocking should be active.
* org-latex.el (org-export-latex-make-header): Define the align
macro if it is not yet defined.
* org-agenda.el (org-agenda-insert-diary-make-new-entry): Call
`org-insert-heading' with the INVISIBLE-OK argument.
* org-mac-message.el (org-mac-message-insert-flagged): Call
`org-insert-heading' with the INVISIBLE-OK argument.
* org.el (org-insert-heading): New argument INVISIBLE-OK.
* org-agenda.el (org-agenda-view-mode-dispatch): Improve the
prompt message.
* org-html.el (org-html-level-start): Use the
`html-container-class' text property to set an additional class
for an outline container.
* org-exp.el (org-export-remember-html-container-classes): New
function.
(org-export-preprocess-string): Call
`org-export-remember-html-container-classes'.
* org.el (org-cycle): Mention level cycling in the docstring.
(org-default-properties): Add new property HTML_CONTAINER_CLASS.
* org-remember.el (org-remember-apply-template): Do file insertion
first.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-habit.el (org-habit-insert-consistency-graphs): Fix a
problem with mis-aligned graphs when showing habits.
2010-04-10 Mikael Fornius <mfo@abc.se>
* org.el (org-assign-fast-keys): Prefer keys used in keyword name
when assigning. Begin using numerical characters when all in name
is used up. This is to spare alphanumeric characters for better
match with other keywords.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-hook): Improve documentation.
* org-latex.el (org-export-latex-preprocess): More consistent
conversion and protection of the words LaTeX and TeX.
(org-export-latex-fontify-headline, org-export-latex-preprocess):
Allow angle brackets in commands, for beamer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-in): Improve the look of the clock line
by formatting links.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-classes): Use AUTO as the place
holder string for the coding system. And improve the
documentation.
(org-export-latex-fix-inputenc): Only modify the coding system if
it is given by the placeholder AUTO.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-task-overrun-text): New option.
(org-task-overrun, org-clock-update-period): New variables.
(org-clock-get-clock-string, org-clock-update-mode-line): Mark
overrun clock.
(org-clock-notify-once-if-expired): Check if clock is overrun.
* org-faces.el: New face `org-mode-line-clock-overrun'.
2010-04-10 Jan Böcker <jan.boecker@jboecker.de>
* org.el (org-narrow-to-subtree): Position the end of the narrowed
region before the line with the next heading, to prevent the user
from prepending text to the next headline.
2010-04-10 Stephen Eglen <stephen@gnu.org>
* org-agenda.el (org-get-time-of-day): Use
org-agenda-time-leading-zero to allow leading zero (rather than
space) for times.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
org-datetree.el is loaded.
* org-datetree.el: autoload `org-datetree-find-day-create'
* org-latex.el (org-export-latex-hyperref-format): New option.
(org-export-latex-links): Use `org-export-latex-hyperref-format'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-ctags.el (org-ctags-enable): Change order of functions.
(org-ctags-create-tags): Add wildcard to file name expansion.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-entry-properties): Fix some important bugs.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-link-unescape, org-link-escape): Only use hexlify if
the table is not explicitly given.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-out-when-done): Allow a list of keywords
as value.
(org-clock-out-if-current): Work with the new list value of
`org-clock-out-when-done'.
(org-clock-out, org-clock-out-if-current): Avoid circular logic
between clocking out and state changes.
* org-ctags.el (org-ctags-path-to-ctags): Better system-type test.
* org-latex.el (org-export-latex-treat-backslash-char): Do not by
accident protect a character that is before a backslash.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-diary-class): Use
`org-order-calendar-date-args'.
* org.el (org-order-calendar-date-args): New function.
* org-exp.el (org-export-target-internal-links): Check for
protectedness after the first bracket.
* org.el (org-entry-properties): Don't match wrong-case TODO
keywords.
* org-agenda.el (org-agenda-schedule, org-agenda-deadline):
Document that ARG is passed through to remove the date.
(org-agenda-bulk-action): Accept prefix arg and pass it on. Do
not read a date when the user has given a `C-u' prefix.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-fix-displayed-tags): Fix bug when all
tags are hidden.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-fix-inputenc): New function.
(org-export-latex-inputenc-alist): New option.
* org-exp.el (org-export): New key SPC to publish enclosing
subtree.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-indent.el (org-indent-add-properties): Catch case when there
is no headline in the buffer.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-html-entities): Add checkmark symbol.
* org-ascii.el (org-export-ascii-preprocess): Protect targets in
verbatim code for ASCII export.
* org.el (org-update-statistics-cookies): Also see checkboxes in
ordered lists.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-view-mode-dispatch): Define the `L'
key.
* org-beamer.el (org-beamer-amend-header): Change the location
where `org-beamer-header-extra' is inserted.
* org.el (org-compute-latex-and-specials-regexp): Don't do BIND
just for computing this regexp.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-frame-default-options): New option.
(org-beamer-sectioning): Use default options if the user does not
have defined any.
(org-beamer-fix-toc): Put a frame around the table of contents.
* org-exp.el (org-export-remove-comment-blocks-and-subtrees): Make
sure case-folding works well when processing comment stuff.
* org-latex.el (org-export-latex-after-save-hook): New hook.
(org-export-as-latex): Run the new hook.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-environments-default): Add the note
environments.
(org-beamer-after-initial-vars): Allow several BEAMER_HEADER_EXTRA
lines and collect and combine the content.
(org-beamer-after-initial-vars): Check for note tags and make sure
they will be seen like a property.
* org.el (org-offer-links-in-entry): Fix bug when there is a
single link.
* org-exp.el (org-export): Make sure the mark is activated, also
when `transient-mark-mode' is off.
* org-agenda.el (org-agenda-search-view-always-boolean): New option.
(org-agenda-search-view-search-words-only): Obsolete variable, is
now an alias for `org-agenda-search-view-always-boolean'.
(org-agenda-search-view-force-full-words): New option.
(org-search-view): Improve docstring, and implement a better logic
for Boolean and phrase searches.
(org-agenda-last-search-view-search-was-boolean): New variable.
(org-agenda-manipulate-query): Consider the type of the last
search when modifying the search string.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-as-latex): Do the first letbind in the
right moment.
* org-agenda.el (org-get-entries-from-diary): Add the new face to
these entries.
* org-faces.el (org-agenda-diary): New face.
* org.el (org-make-link-regexps): Allow regexp-special characters
in link types.
(org-open-file): When in-emacs is `system', also force system
opening, like when the value was `(16)'.
(org-update-statistics-cookies): Handle entries without children.
* org-exp.el
(org-export-preprocess-before-normalizing-links-hook): New hook.
(org-export-preprocess-string): Run the new hook.
* org.el (org-offer-links-in-entry): Make RET open all links.
* org-html.el (org-export-as-html): Remove any leftover display
properties in the html file.
* org-wl.el (org-wl-store-link): Work-around for format bug with
text properties.
* org-habit.el (org-habit-insert-consistency-graphs): Turn off
invisibility while adding the graphs.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-select-remember-template): Use C letter to
customize remember templates.
* org-agenda.el (org-agenda-bulk-mark, org-agenda-bulk-unmark):
Move cursor to next visible line.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-sectioning): Leave columns environment
by specifying 0 or 1 for column width.
(org-beamer-column-widths): Make 0 stand for 0.0.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-mark-radio-links): Don't match inside
<<target>>.
* org.el (org-format-latex-header-extra): New variable.
(org-format-latex): Set org-format-latex-header-extra from
in-buffer stuff.
(org-format-latex): Add org-format-latex-header-extra to the
variables on which image creation depends.
(org-create-formula-image): Add the header stuff from in-buffer
settings.
(org-read-date-analyze): Base the analysis for future preference
on NOW, not on the default date.
* org-inlinetask.el (org-inlinetask-export-handler): Add CSS class
for TODO keyword in inline tasks.
* org.el (org-log-note-headings): New headings for removing
deadline or scheduling date.
(org-deadline, org-schedule): Arrange for logging when removing a
date.
(org-add-log-note): Handle deadline and scheduling removal.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-visible): Add LaTeX/pdf export.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-diary-class): New function.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Do process the text
of a radio target.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-entry-properties): Add TIMESTAMP properties back
in.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-all-time-keywords): New variable.
(org-set-regexps-and-options): Set `org-all-time-keywords'.
(org-entry-blocked-p): New function.
(org-special-properties): Add BLOCKED as a new special property.
(org-entry-properties): New optional argument SPECIFIC, only parse
for this property when it is specified.
(org-entry-get): Pass a SPECIFIC argument to
`org-entry-properties'.
* org-latex.el (org-export-as-latex): Preprocess TEXT as well.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables): No forced line end if
there is no caption.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-html-entities): Add Euro symbols from Marvosym
package.
* org-latex.el (org-export-latex-tables): Only add a caption when
macro in in longtable environments if one has been defined.
* org-html.el (org-export-as-html): Only take title from buffer if
not exporting body-only.
* org-latex.el (org-export-latex-preprocess): Better version of
the regular expression for protecting LaTeX macros.
(org-export-latex-preprocess): Start searching for macros to
protect from beginning of buffer.
* org-exp.el (org-export-target-internal-links): Check for
protectedness earlier in the string.
* org-agenda.el (org-agenda-highlight-todo): Match TODO keywords
case sensitively.
* org-id.el (org-id-store-link): Match TODO keywords case
sensitively.
* org.el (org-heading-components, org-get-outline-path)
(org-display-outline-path): Match TODO keywords case sensitively.
* org-latex.el (org-export-as-latex): Ignore read-only
properties.
* org-exp.el (org-export-preprocess-string): Remove any
`read-only' properties.
* org-agenda.el (org-agenda-inactive-leader): New option.
(org-agenda-get-timestamps): Use `org-agenda-inactive-leader'.
(org-tags-view): Prompt for matcher if MATCH is an empty string.
(org-todo-list): Prompt for matcher if ARG is an empty string.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-link-functions): New hook.
(org-open-at-point): Run `org-open-link-functions'.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-date-prompt): Allow inactive time
stamps as well.
* org.el (org-inhibit-startup-visibility-stuff): New variable.
(org-mode): Don't do startup visibility if inhibited.
(org-outline-overlay-data, org-set-outline-overlay-data): New
functions.
(org-save-outline-visibility): New macro.
(org-log-note-headings): Document that one should not change the
`state' note format.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-make-link-regexps): Capture link path into a group.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-beamer.el (org-beamer-after-initial-vars): Do not overwrite
the options plist.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-startup-with-beamer-mode): New option.
(org-property-changed-functions)
(org-property-allowed-value-functions): New hooks.
(org-entry-put, org-property-get-allowed-values): Run the new
hooks.
(org-property-next-allowed-value): Run the new hooks.
* org-exp.el (org-export-select-backend-specific-text): Add the
special beamer tags.
* org-beamer.el
(org-export-preprocess-before-selecting-backend-code-hook): New
file.
* org-latex.el (org-export-latex-after-initial-vars-hook): New hook.
(org-export-as-latex): Run
`org-export-latex-after-initial-vars-hook'.
(org-export-latex-format-toc-function)
(org-export-latex-make-header): Call
`org-export-latex-format-toc-function'.
* org.el (org-fill-template): Make template searches case sensitive.
* org-exp.el (org-export): Use "1" as a sign to export only the
subtree.
* org-colview-xemacs.el (org-columns-edit-value): Use
org-unrestricted property.
* org-colview.el (org-columns-edit-value): Use
org-unrestricted property.
* org.el (org-compute-property-at-point): Set org-unrestricted
text property if the list contains ":ETC".
(org-insert-property-drawer): Use
org-unrestricted property.
* org-exp.el
(org-export-preprocess-before-selecting-backend-code-hook): New hook.
(org-export-preprocess-string): Run
`org-export-preprocess-before-selecting-backend-code-hook'.
* org-xoxo.el (org-export-as-xoxo): Run `org-export-first-hook'.
* org-latex.el (org-export-region-as-latex): Run
`org-export-first-hook'.
* org-html.el (org-export-as-html): Run `org-export-first-hook'.
* org-docbook.el (org-export-as-docbook): Run
`org-export-first-hook'.
* org-ascii.el (org-export-as-ascii): Run `org-export-first-hook'.
* org-exp.el (org-export-first-hook): New hook.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-previous-item): Exit at the beginning of the
buffer.
* org-id.el (org-id-locations-save): Only write the id locations
if any are defined.
* org-archive.el (org-archive-all-done): Make this work in a file
with org-odd-levels-only set.
* org.el (org-get-refile-targets): Catch the case when a buffer
has no file.
* org-latex.el (org-export-as-latex): Cleanup forced line ends
where they are not needed.
(org-export-latex-subcontent): Remove unnecessary newlines.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Remove \obeylines.
(org-export-latex-fontify): Fix regexp bug that takes special
care of protecting the right boundary characters in emphasis
matches.
(org-export-latex-preprocess): Allow multiple arguments to latex
macros.
* org.el (org-make-link-regexps): Use John Gruber's regexp for
urls.
* org-macs.el (org-re): Interpret :punct: in regexps.
* org-exp.el (org-export-replace-src-segments-and-examples): Also
take the final newline after the END line.
* org.el (org-clean-visibility-after-subtree-move): Only fix
entries that are not entirely invisible already.
(org-insert-link): Respect org-link-file-path-type for
"docview:" links in addition to "file:" links.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Avoid
additional extra white lines in LaTeX.
* org-list.el (org-list-parse-list): Leave empty lines after the
list, don't consider them as part of the list.
* org-mobile.el (org-mobile-sumo-agenda-command): Allow tagstodo
searches.
* org-clock.el (org-clock-select-task): Convert integer to
character for XEmacs.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-resolve): Make reading a char XEmacs
compatible.
2010-04-10 Tassilo Horn <tassilo@member.fsf.org>
* org.el (org-complete-tags-always-offer-all-agenda-tags): New
variable.
(org-set-tags): Use it.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-list.el (org-empty-line-terminates-plain-lists): Update
docstring.
* org.el (org-format-latex): Fix link creation for processed latex
snippets.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-normalize): Protect replacement
text.
* org.el (org-inside-latex-macro-p): Save match data.
2010-04-10 Jan Böcker <jan.boecker@jboecker.de>
* org-docview.el: New file.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-class-options): New variable.
(org-export-latex-set-initial-vars): Use the class options.
* org.el (org-forward-same-level): Stop at headings that start
with an invisible character.
(org-additional-option-like-keywords): Add LaTeX_CLASS_OPTIONS.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-normalize): Don't take optional
arguments in LaTeX macros as footnotes.
* org.el (org-inside-latex-macro-p): New function.
* org-latex.el (org-latex-to-pdf-process): Change customization
group to `org-export-pdf'.
* org-agenda.el (org-agenda-get-blocks): Look at time string also
on days after the first one.
* org.el (org-insert-heading): Also check for item before assuming
before-first-heading condition.
* org-latex.el (org-latex-to-pdf-process): Fix typo in group tag.
(org-export-pdf-logfiles): New option.
(org-export-as-pdf): Use `org-export-pdf-logfiles'.
(org-export-pdf-logfiles): Fix customization type.
* org.el (org-insert-link): Improve error message when there is no
default link to select with RET.
* org-agenda.el (org-agenda-filter-by-tag): Use char argument from
parameter list.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-parse-global)
(org-export-latex-parse-content)
(org-export-latex-parse-subcontent): Use
`org-re-search-forward-unprotected'.
(org-export-as-pdf): Remove log files produced by XeTeX.
* org-macs.el (org-re-search-forward-unprotected): New function.
2010-04-10 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-agenda-colview-summarize): Sort out some
confusion between properties and titles, which resulted in
agenda summaries not working if a title was set for a column.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-agendas): New option.
(org-mobile-sumo-agenda-command): Select the right agendas.
* org-latex.el (org-export-latex-format-image): Preserve the
original-indentation property.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-insert-selection-line): Catch error when
an old tasks no longer exists.
* org-latex.el (org-export-as-pdf): Remove also the .idx file.
(org-export-as-pdf): Don't remove the old PDF file before making
the new one.
* org-mouse.el (org-mouse-end-headline, org-mouse-insert-item)
(org-mouse-context-menu): Use `org-looking-back'.
* org.el (org-cycle-level): Use `org-looking-back'.
* org-list.el (org-cycle-item-indentation): Use
`org-looking-back'.
* org-compat.el (org-looking-back): New function.
* org.el (org-insert-heading): Catch before-first-headline when
inserting a headline.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-format-image): Indent figure
environment, so that it does not interrupt plain list.
* org.el (org-open-at-point): Allow long link descriptions.
2010-04-10 Carsten Dominik <carsten.dominik@gmail.com>
* org-html.el (org-export-as-html): Remove empty lines at the
beginning of the exported text.
2010-04-15 Carsten Dominik <carsten.dominik@gmail.com>
* org.texi (LaTeX and PDF export): Add a footnote about xetex.
(LaTeX/PDF export commands): Section renamed and
moved.
(Sectioning structure): Update.
(References): New use case for field coordinates.
(The export dispatcher): Renamed from ASCII export.
(Setting up the staging area): Document the availability of
encryption for MobileOrg.
(Images and tables): Document how to reference labels.
(Index entries): New section.
(Generating an index): New section.
(Column width and alignment): Document that <N> now
means a fixed width, not a maximum width.
(Publishing options): Document the :email option.
(Beamer class export): Fix bug in the BEAMER example.
(Refiling notes): Document refile logging.
(In-buffer settings): Document refile logging keywords.
(Drawers): Document `C-c C-z' command.
(Agenda commands): Mention the alternative key `C-c C-z'.
(Special properties): Document the BLOCKED property.
(The spreadsheet): Mention the formula editor.
(References): Document field coordinates.
(Publishing action): Correct the documentation for the
publishing function.
(The date/time prompt): Document that we accept dates
like month/day/year.
(Cooperation): Document the changes in table.el support.
(Faces for TODO keywords, Faces for TODO keywords)
(Priorities): Document the easy colors.
(Visibility cycling): Document the new double prefix
arg for `org-reveal'.
(Cooperation): Remember.el is part of Emacs.
(Clean view): Mention that `wrap-prefix' is also set by
org-indent-mode.
(Agenda commands): Add information about prefix args to
scheduling and deadline commands.
(Search view): Point to the docstring of
`org-search-view' for more details.
(Agenda commands): Document that `>' prompts for a
date.
(Setting tags): Document variable
org-complete-tags-always-offer-all-agenda-tags.
(Column attributes): Cross-reference special
properties.
1061 lines
39 KiB
EmacsLisp
1061 lines
39 KiB
EmacsLisp
;;; org-mobile.el --- Code for asymmetric sync with a mobile device
|
|
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
|
|
;;
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
;; Homepage: http://orgmode.org
|
|
;; Version: 6.35i
|
|
;;
|
|
;; 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 code to interact with Richard Moreland's iPhone
|
|
;; application MobileOrg. This code is documented in Appendix B of the
|
|
;; Org-mode manual. The code is not specific for the iPhone, however.
|
|
;; Any external viewer/flagging/editing application that uses the same
|
|
;; conventions could be used.
|
|
|
|
(require 'org)
|
|
(require 'org-agenda)
|
|
(eval-when-compile (require 'cl))
|
|
|
|
(defgroup org-mobile nil
|
|
"Options concerning support for a viewer/editor on a mobile device."
|
|
:tag "Org Mobile"
|
|
:group 'org)
|
|
|
|
(defcustom org-mobile-files '(org-agenda-files)
|
|
"Files to be staged for MobileOrg.
|
|
This is basically a list of files and directories. Files will be staged
|
|
directly. Directories will be search for files with the extension `.org'.
|
|
In addition to this, the list may also contain the following symbols:
|
|
|
|
org-agenda-files
|
|
This means include the complete, unrestricted list of files given in
|
|
the variable `org-agenda-files'.
|
|
org-agenda-text-search-extra-files
|
|
Include the files given in the variable
|
|
`org-agenda-text-search-extra-files'"
|
|
:group 'org-mobile
|
|
:type '(list :greedy t
|
|
(option (const :tag "org-agenda-files" org-agenda-files))
|
|
(option (const :tag "org-agenda-text-search-extra-files"
|
|
org-agenda-text-search-extra-files))
|
|
(repeat :inline t :tag "Additional files"
|
|
(file))))
|
|
|
|
(defcustom org-mobile-directory ""
|
|
"The WebDAV directory where the interaction with the mobile takes place."
|
|
:group 'org-mobile
|
|
:type 'directory)
|
|
|
|
(defcustom org-mobile-use-encryption nil
|
|
"Non-nil means keep only encrypted files on the webdav server.
|
|
Encryption uses AES-256, with a password given in
|
|
`org-mobile-encryption-password'.
|
|
When nil, plain files are kept on the server.
|
|
Turning on encryption requires to set the same password in the MobileOrg
|
|
application."
|
|
:group 'org-mobile
|
|
:type 'boolean)
|
|
|
|
(defcustom org-mobile-encryption-tempfile "~/orgtmpcrypt"
|
|
"File that is being used as a temporary file for encryption.
|
|
This must be local file on your local machine (not on the webdav server).
|
|
You might want to put this file into a directory where only you have access."
|
|
:group 'org-mobile
|
|
:type 'directory)
|
|
|
|
(defcustom org-mobile-encryption-password ""
|
|
"Password for encrypting files uploaded to the server.
|
|
This is a single password which is used for AES-256 encryption. The same
|
|
password must also be set in the MobileOrg application. All Org files,
|
|
including mobileorg.org will be encrypted using this password.
|
|
Note that, whe Org runs the encryption commands, the password could
|
|
be visible on your system with the `ps' command. So this method is only
|
|
intended to keep the files secure on the server, not on your own machine."
|
|
:group 'org-mobile
|
|
:type '(string :tag "Password"))
|
|
|
|
(defcustom org-mobile-inbox-for-pull "~/org/from-mobile.org"
|
|
"The file where captured notes and flags will be appended to.
|
|
During the execution of `org-mobile-pull', the file
|
|
`org-mobile-capture-file' will be emptied it's contents have
|
|
been appended to the file given here. This file should be in
|
|
`org-directory', and not in the staging area or on the web server."
|
|
:group 'org-mobile
|
|
:type 'file)
|
|
|
|
(defconst org-mobile-capture-file "mobileorg.org"
|
|
"The capture file where the mobile stores captured notes and flags.
|
|
This should not be changed, because MobileOrg assumes this name.")
|
|
|
|
(defcustom org-mobile-index-file "index.org"
|
|
"The index file with inks to all Org files that should be loaded by MobileOrg.
|
|
Relative to `org-mobile-directory'. The Address field in the MobileOrg setup
|
|
should point to this file."
|
|
:group 'org-mobile
|
|
:type 'file)
|
|
|
|
(defcustom org-mobile-agendas 'all
|
|
"The agendas that should be pushed to MobileOrg.
|
|
Allowed values:
|
|
|
|
default the weekly agenda and the global TODO list
|
|
custom all custom agendas defined by the user
|
|
all the custom agendas and the default ones
|
|
list a list of selection key(s) as string."
|
|
:group 'org-mobile
|
|
:type '(choice
|
|
(const :tag "Default Agendas" default)
|
|
(const :tag "Custom Agendas" custom)
|
|
(const :tag "Default and Custom Agendas" all)
|
|
(repeat :tag "Selected"
|
|
(string :tag "Selection Keys"))))
|
|
|
|
(defcustom org-mobile-force-id-on-agenda-items t
|
|
"Non-nil means make all agenda items carry and ID."
|
|
:group 'org-mobile
|
|
:type 'boolean)
|
|
|
|
(defcustom org-mobile-force-mobile-change nil
|
|
"Non-nil means force the change made on the mobile device.
|
|
So even if there have been changes to the computer version of the entry,
|
|
force the new value set on the mobile.
|
|
When nil, mark the entry from the mobile with an error message.
|
|
Instead of nil or t, this variable can also be a list of symbols, indicating
|
|
the editing types for which the mobile version should always dominate."
|
|
:group 'org-mobile
|
|
:type '(choice
|
|
(const :tag "Always" t)
|
|
(const :tag "Never" nil)
|
|
(set :greedy t :tag "Specify"
|
|
(const todo)
|
|
(const tags)
|
|
(const priority)
|
|
(const heading)
|
|
(const body))))
|
|
|
|
(defcustom org-mobile-action-alist
|
|
'(("edit" . (org-mobile-edit data old new)))
|
|
"Alist with flags and actions for mobile sync.
|
|
When flagging an entry, MobileOrg will create entries that look like
|
|
|
|
* F(action:data) [[id:entry-id][entry title]]
|
|
|
|
This alist defines that the ACTION in the parentheses of F() should mean,
|
|
i.e. what action should be taken. The :data part in the parenthesis is
|
|
optional. If present, the string after the colon will be passed to the
|
|
action form as the `data' variable.
|
|
The car of each elements of the alist is an actions string. The cdr is
|
|
an Emacs Lisp form that will be evaluated with the cursor on the headline
|
|
of that entry.
|
|
|
|
For now, it is not recommended to change this variable."
|
|
:group 'org-mobile
|
|
:type '(repeat
|
|
(cons (string :tag "Action flag")
|
|
(sexp :tag "Action form"))))
|
|
|
|
(defcustom org-mobile-checksum-binary (or (executable-find "shasum")
|
|
(executable-find "sha1sum")
|
|
(executable-find "md5sum")
|
|
(executable-find "md5"))
|
|
"Executable used for computing checksums of agenda files."
|
|
:group 'org-mobile
|
|
:type 'string)
|
|
|
|
(defvar org-mobile-pre-push-hook nil
|
|
"Hook run before running `org-mobile-push'.
|
|
This could be used to clean up `org-mobile-directory', for example to
|
|
remove files that used to be included in the agenda but no longer are.
|
|
The presence of such files would not really be a problem, but after time
|
|
they may accumulate.")
|
|
|
|
(defvar org-mobile-post-push-hook nil
|
|
"Hook run after running `org-mobile-push'.
|
|
If Emacs does not have direct write access to the WebDAV directory used
|
|
by the mobile device, this hook should be used to copy all files from the
|
|
local staging directory `org-mobile-directory' to the WebDAV directory,
|
|
for example using `rsync' or `scp'.")
|
|
|
|
(defvar org-mobile-pre-pull-hook nil
|
|
"Hook run before executing `org-mobile-pull'.
|
|
If Emacs does not have direct write access to the WebDAV directory used
|
|
by the mobile device, this hook should be used to copy the capture file
|
|
`mobileorg.org' from the WebDAV location to the local staging
|
|
directory `org-mobile-directory'.")
|
|
|
|
(defvar org-mobile-post-pull-hook nil
|
|
"Hook run after running `org-mobile-pull'.
|
|
If Emacs does not have direct write access to the WebDAV directory used
|
|
by the mobile device, this hook should be used to copy the emptied
|
|
capture file `mobileorg.org' back to the WebDAV directory, for example
|
|
using `rsync' or `scp'.")
|
|
|
|
(defvar org-mobile-last-flagged-files nil
|
|
"List of files containing entries flagged in the latest pull.")
|
|
|
|
(defvar org-mobile-files-alist nil)
|
|
(defvar org-mobile-checksum-files nil)
|
|
|
|
(defun org-mobile-prepare-file-lists ()
|
|
(setq org-mobile-files-alist (org-mobile-files-alist))
|
|
(setq org-mobile-checksum-files nil))
|
|
|
|
(defun org-mobile-files-alist ()
|
|
"Expand the list in `org-mobile-files' to a list of existing files."
|
|
(let* ((include-archives
|
|
(and (member 'org-agenda-text-search-extra-files org-mobile-files)
|
|
(member 'agenda-archives org-agenda-text-search-extra-files)
|
|
t))
|
|
(files
|
|
(apply 'append
|
|
(mapcar
|
|
(lambda (f)
|
|
(cond
|
|
((eq f 'org-agenda-files)
|
|
(org-agenda-files t include-archives))
|
|
((eq f 'org-agenda-text-search-extra-files)
|
|
(delq 'agenda-archives
|
|
(copy-sequence
|
|
org-agenda-text-search-extra-files)))
|
|
((and (stringp f) (file-directory-p f))
|
|
(directory-files f 'full "\\.org\\'"))
|
|
((and (stringp f) (file-exists-p f))
|
|
(list f))
|
|
(t nil)))
|
|
org-mobile-files)))
|
|
(orgdir-uname (file-name-as-directory (file-truename org-directory)))
|
|
(orgdir-re (concat "\\`" (regexp-quote orgdir-uname)))
|
|
uname seen rtn file link-name)
|
|
;; Make the files unique, and determine the name under which they will
|
|
;; be listed.
|
|
(while (setq file (pop files))
|
|
(if (not (file-name-absolute-p file))
|
|
(setq file (expand-file-name file org-directory)))
|
|
(setq uname (file-truename file))
|
|
(unless (member uname seen)
|
|
(push uname seen)
|
|
(if (string-match orgdir-re uname)
|
|
(setq link-name (substring uname (match-end 0)))
|
|
(setq link-name (file-name-nondirectory uname)))
|
|
(push (cons file link-name) rtn)))
|
|
(nreverse rtn)))
|
|
|
|
;;;###autoload
|
|
(defun org-mobile-push ()
|
|
"Push the current state of Org affairs to the WebDAV directory.
|
|
This will create the index file, copy all agenda files there, and also
|
|
create all custom agenda views, for upload to the mobile phone."
|
|
(interactive)
|
|
(let ((a-buffer (get-buffer org-agenda-buffer-name)))
|
|
(let ((org-agenda-buffer-name "*SUMO*")
|
|
(org-agenda-filter org-agenda-filter)
|
|
(org-agenda-redo-command org-agenda-redo-command))
|
|
(save-excursion
|
|
(save-window-excursion
|
|
(org-mobile-check-setup)
|
|
(org-mobile-prepare-file-lists)
|
|
(run-hooks 'org-mobile-pre-push-hook)
|
|
(message "Creating agendas...")
|
|
(let ((inhibit-redisplay t)) (org-mobile-create-sumo-agenda))
|
|
(message "Creating agendas...done")
|
|
(org-save-all-org-buffers) ; to save any IDs created by this process
|
|
(message "Copying files...")
|
|
(org-mobile-copy-agenda-files)
|
|
(message "Writing index file...")
|
|
(org-mobile-create-index-file)
|
|
(message "Writing checksums...")
|
|
(org-mobile-write-checksums)
|
|
(run-hooks 'org-mobile-post-push-hook))))
|
|
(redraw-display)
|
|
(when (and a-buffer (buffer-live-p a-buffer))
|
|
(if (not (get-buffer-window a-buffer))
|
|
(kill-buffer a-buffer)
|
|
(let ((cw (selected-window)))
|
|
(select-window (get-buffer-window a-buffer))
|
|
(org-agenda-redo)
|
|
(select-window cw)))))
|
|
(message "Files for mobile viewer staged"))
|
|
|
|
(defvar org-mobile-before-process-capture-hook nil
|
|
"Hook that is run after content was moved to `org-mobile-inbox-for-pull'.
|
|
The inbox file is visited by the current buffer, and the buffer is
|
|
narrowed to the newly captured data.")
|
|
|
|
;;;###autoload
|
|
(defun org-mobile-pull ()
|
|
"Pull the contents of `org-mobile-capture-file' and integrate them.
|
|
Apply all flagged actions, flag entries to be flagged and then call an
|
|
agenda view showing the flagged items."
|
|
(interactive)
|
|
(org-mobile-check-setup)
|
|
(run-hooks 'org-mobile-pre-pull-hook)
|
|
(let ((insertion-marker (org-mobile-move-capture)))
|
|
(if (not (markerp insertion-marker))
|
|
(message "No new items")
|
|
(org-with-point-at insertion-marker
|
|
(save-restriction
|
|
(narrow-to-region (point) (point-max))
|
|
(run-hooks 'org-mobile-before-process-capture-hook)))
|
|
(org-with-point-at insertion-marker
|
|
(org-mobile-apply (point) (point-max)))
|
|
(move-marker insertion-marker nil)
|
|
(run-hooks 'org-mobile-post-pull-hook)
|
|
(when org-mobile-last-flagged-files
|
|
;; Make an agenda view of flagged entries, but only in the files
|
|
;; where stuff has been added.
|
|
(put 'org-agenda-files 'org-restrict org-mobile-last-flagged-files)
|
|
(let ((org-agenda-keep-restricted-file-list t))
|
|
(org-agenda nil "?"))))))
|
|
|
|
(defun org-mobile-check-setup ()
|
|
"Check if org-mobile-directory has been set up."
|
|
(unless (and org-directory
|
|
(stringp org-directory)
|
|
(string-match "\\S-" org-directory)
|
|
(file-exists-p org-directory)
|
|
(file-directory-p org-directory))
|
|
(error
|
|
"Please set `org-directory' to the directory where your org files live"))
|
|
(unless (and org-mobile-directory
|
|
(stringp org-mobile-directory)
|
|
(string-match "\\S-" org-mobile-directory)
|
|
(file-exists-p org-mobile-directory)
|
|
(file-directory-p org-mobile-directory))
|
|
(error
|
|
"Variable `org-mobile-directory' must point to an existing directory"))
|
|
(unless (and org-mobile-inbox-for-pull
|
|
(stringp org-mobile-inbox-for-pull)
|
|
(string-match "\\S-" org-mobile-inbox-for-pull)
|
|
(file-exists-p
|
|
(file-name-directory org-mobile-inbox-for-pull)))
|
|
(error
|
|
"Variable `org-mobile-inbox-for-pull' must point to a file in an existing directory"))
|
|
(when org-mobile-use-encryption
|
|
(unless (string-match "\\S-" org-mobile-encryption-password)
|
|
(error
|
|
"To use encryption, you must set `org-mobile-encryption-password'"))
|
|
(unless (file-writable-p org-mobile-encryption-tempfile)
|
|
(error "Cannot write to entryption tempfile %s"
|
|
org-mobile-encryption-tempfile))
|
|
(unless (executable-find "openssl")
|
|
(error "openssl is needed to encrypt files."))))
|
|
|
|
(defun org-mobile-create-index-file ()
|
|
"Write the index file in the WebDAV directory."
|
|
(let ((files-alist (sort (copy-sequence org-mobile-files-alist)
|
|
(lambda (a b) (string< (cdr a) (cdr b)))))
|
|
(def-todo (default-value 'org-todo-keywords))
|
|
(def-tags (default-value 'org-tag-alist))
|
|
file link-name todo-kwds done-kwds tags drawers entry kwds dwds twds)
|
|
|
|
(org-prepare-agenda-buffers (mapcar 'car files-alist))
|
|
(setq done-kwds (org-uniquify org-done-keywords-for-agenda))
|
|
(setq todo-kwds (org-delete-all
|
|
done-kwds
|
|
(org-uniquify org-todo-keywords-for-agenda)))
|
|
(setq drawers (org-uniquify org-drawers-for-agenda))
|
|
(setq tags (org-uniquify
|
|
(delq nil
|
|
(mapcar
|
|
(lambda (e)
|
|
(cond ((stringp e) e)
|
|
((listp e)
|
|
(if (stringp (car e)) (car e) nil))
|
|
(t nil)))
|
|
org-tag-alist-for-agenda))))
|
|
(with-temp-file
|
|
(expand-file-name org-mobile-index-file org-mobile-directory)
|
|
(while (setq entry (pop def-todo))
|
|
(insert "#+READONLY\n")
|
|
(setq kwds (mapcar (lambda (x) (if (string-match "(" x)
|
|
(substring x 0 (match-beginning 0))
|
|
x))
|
|
(cdr entry)))
|
|
(insert "#+TODO: " (mapconcat 'identity kwds " ") "\n")
|
|
(setq dwds (member "|" kwds)
|
|
twds (org-delete-all dwds kwds)
|
|
todo-kwds (org-delete-all twds todo-kwds)
|
|
done-kwds (org-delete-all dwds done-kwds)))
|
|
(when (or todo-kwds done-kwds)
|
|
(insert "#+TODO: " (mapconcat 'identity todo-kwds " ") " | "
|
|
(mapconcat 'identity done-kwds " ") "\n"))
|
|
(setq def-tags (mapcar
|
|
(lambda (x)
|
|
(cond ((null x) nil)
|
|
((stringp x) x)
|
|
((eq (car x) :startgroup) "{")
|
|
((eq (car x) :endgroup) "}")
|
|
((eq (car x) :newline) nil)
|
|
((listp x) (car x))
|
|
(t nil)))
|
|
def-tags))
|
|
(setq def-tags (delq nil def-tags))
|
|
(setq tags (org-delete-all def-tags tags))
|
|
(setq tags (sort tags (lambda (a b) (string< (downcase a) (downcase b)))))
|
|
(setq tags (append def-tags tags nil))
|
|
(insert "#+TAGS: " (mapconcat 'identity tags " ") "\n")
|
|
(insert "#+DRAWERS: " (mapconcat 'identity drawers " ") "\n")
|
|
(insert "#+ALLPRIORITIES: A B C" "\n")
|
|
(when (file-exists-p (expand-file-name
|
|
org-mobile-directory "agendas.org"))
|
|
(insert "* [[file:agendas.org][Agenda Views]]\n"))
|
|
(while (setq entry (pop files-alist))
|
|
(setq file (car entry)
|
|
link-name (cdr entry))
|
|
(insert (format "* [[file:%s][%s]]\n"
|
|
link-name link-name)))
|
|
(push (cons org-mobile-index-file (md5 (buffer-string)))
|
|
org-mobile-checksum-files))))
|
|
|
|
(defun org-mobile-copy-agenda-files ()
|
|
"Copy all agenda files to the stage or WebDAV directory."
|
|
(let ((files-alist org-mobile-files-alist)
|
|
file buf entry link-name target-path target-dir check)
|
|
(while (setq entry (pop files-alist))
|
|
(setq file (car entry) link-name (cdr entry))
|
|
(when (file-exists-p file)
|
|
(setq target-path (expand-file-name link-name org-mobile-directory)
|
|
target-dir (file-name-directory target-path))
|
|
(unless (file-directory-p target-dir)
|
|
(make-directory target-dir 'parents))
|
|
(if org-mobile-use-encryption
|
|
(org-mobile-encrypt-and-move file target-path)
|
|
(copy-file file target-path 'ok-if-exists))
|
|
(setq check (shell-command-to-string
|
|
(concat org-mobile-checksum-binary " "
|
|
(shell-quote-argument (expand-file-name file)))))
|
|
(when (string-match "[a-fA-F0-9]\\{30,40\\}" check)
|
|
(push (cons link-name (match-string 0 check))
|
|
org-mobile-checksum-files))))
|
|
(setq file (expand-file-name org-mobile-capture-file
|
|
org-mobile-directory))
|
|
(save-excursion
|
|
(setq buf (find-file file))
|
|
(and (= (point-min) (point-max)) (insert "\n"))
|
|
(save-buffer)
|
|
(push (cons org-mobile-capture-file (md5 (buffer-string)))
|
|
org-mobile-checksum-files))
|
|
(kill-buffer buf)))
|
|
|
|
(defun org-mobile-write-checksums ()
|
|
"Create checksums for all files in `org-mobile-directory'.
|
|
The table of checksums is written to the file mobile-checksums."
|
|
(let ((sumfile (expand-file-name "checksums.dat" org-mobile-directory))
|
|
(files org-mobile-checksum-files)
|
|
entry file sum)
|
|
(with-temp-file sumfile
|
|
(set-buffer-file-coding-system 'undecided-unix nil)
|
|
(while (setq entry (pop files))
|
|
(setq file (car entry) sum (cdr entry))
|
|
(insert (format "%s %s\n" sum file))))))
|
|
|
|
(defun org-mobile-sumo-agenda-command ()
|
|
"Return an agenda custom command that comprises all custom commands."
|
|
(let ((custom-list
|
|
;; normalize different versions
|
|
(delq nil
|
|
(mapcar
|
|
(lambda (x)
|
|
(cond ((stringp (cdr x)) nil)
|
|
((stringp (nth 1 x)) x)
|
|
((not (nth 1 x)) (cons (car x) (cons "" (cddr x))))
|
|
(t (cons (car x) (cons "" (cdr x))))))
|
|
org-agenda-custom-commands)))
|
|
(default-list '(("a" "Agenda" agenda) ("t" "All TODO" alltodo)))
|
|
thelist new e key desc type match settings cmds gkey gdesc gsettings cnt)
|
|
(cond
|
|
((eq org-mobile-agendas 'custom)
|
|
(setq thelist custom-list))
|
|
((eq org-mobile-agendas 'default)
|
|
(setq thelist default-list))
|
|
((eq org-mobile-agendas 'all)
|
|
(setq thelist custom-list)
|
|
(unless (assoc "t" thelist) (push '("t" "ALL TODO" alltodo) thelist))
|
|
(unless (assoc "a" thelist) (push '("a" "Agenda" agenda) thelist)))
|
|
((listp org-mobile-agendas)
|
|
(setq thelist (append custom-list default-list))
|
|
(setq thelist (delq nil (mapcar (lambda (k) (assoc k thelist))
|
|
org-mobile-agendas)))))
|
|
(while (setq e (pop thelist))
|
|
(cond
|
|
((stringp (cdr e))
|
|
;; this is a description entry - skip it
|
|
)
|
|
((eq (nth 2 e) 'search)
|
|
;; Search view is interactive, skip
|
|
)
|
|
((memq (nth 2 e) '(todo-tree tags-tree occur-tree))
|
|
;; These are trees, not really agenda commands
|
|
)
|
|
((and (memq (nth 2 e) '(todo tags tags-todo))
|
|
(or (null (nth 3 e))
|
|
(not (string-match "\\S-" (nth 3 e)))))
|
|
;; These would be interactive because the match string is empty
|
|
)
|
|
((memq (nth 2 e) '(agenda alltodo todo tags tags-todo))
|
|
;; a normal command
|
|
(setq key (car e) desc (nth 1 e) type (nth 2 e) match (nth 3 e)
|
|
settings (nth 4 e))
|
|
(setq settings
|
|
(cons (list 'org-agenda-title-append
|
|
(concat "<after>KEYS=" key " TITLE: "
|
|
(if (and (stringp desc) (> (length desc) 0))
|
|
desc (symbol-name type))
|
|
" " match "</after>"))
|
|
settings))
|
|
(push (list type match settings) new))
|
|
((symbolp (nth 2 e))
|
|
;; A user-defined function, not sure how to handle that yet
|
|
)
|
|
(t
|
|
;; a block agenda
|
|
(setq gkey (car e) gdesc (nth 1 e) gsettings (nth 3 e) cmds (nth 2 e))
|
|
(setq cnt 0)
|
|
(while (setq e (pop cmds))
|
|
(setq type (car e) match (nth 1 e) settings (nth 2 e))
|
|
(setq settings (append gsettings settings))
|
|
(setq settings
|
|
(cons (list 'org-agenda-title-append
|
|
(concat "<after>KEYS=" gkey "#" (number-to-string
|
|
(setq cnt (1+ cnt)))
|
|
" TITLE: " gdesc " " match "</after>"))
|
|
settings))
|
|
(push (list type match settings) new)))))
|
|
(and new (list "X" "SUMO" (reverse new)
|
|
'((org-agenda-compact-blocks nil))))))
|
|
|
|
(defvar org-mobile-creating-agendas nil)
|
|
(defun org-mobile-write-agenda-for-mobile (file)
|
|
(let ((all (buffer-string)) in-date id pl prefix line app short m sexp)
|
|
(with-temp-file file
|
|
(org-mode)
|
|
(insert "#+READONLY\n")
|
|
(insert all)
|
|
(goto-char (point-min))
|
|
(while (not (eobp))
|
|
(cond
|
|
((looking-at "[ \t]*$")) ; keep empty lines
|
|
((looking-at "=+$")
|
|
;; remove underlining
|
|
(delete-region (point) (point-at-eol)))
|
|
((get-text-property (point) 'org-agenda-structural-header)
|
|
(setq in-date nil)
|
|
(setq app (get-text-property (point)
|
|
'org-agenda-title-append))
|
|
(setq short (get-text-property (point)
|
|
'short-heading))
|
|
(when (and short (looking-at ".+"))
|
|
(replace-match short)
|
|
(beginning-of-line 1))
|
|
(when app
|
|
(end-of-line 1)
|
|
(insert app)
|
|
(beginning-of-line 1))
|
|
(insert "* "))
|
|
((get-text-property (point) 'org-agenda-date-header)
|
|
(setq in-date t)
|
|
(insert "** "))
|
|
((setq m (or (get-text-property (point) 'org-hd-marker)
|
|
(get-text-property (point) 'org-marker)))
|
|
(setq sexp (member (get-text-property (point) 'type)
|
|
'("diary" "sexp")))
|
|
(if (setq pl (get-text-property (point) 'prefix-length))
|
|
(progn
|
|
(setq prefix (org-trim (buffer-substring
|
|
(point) (+ (point) pl)))
|
|
line (org-trim (buffer-substring
|
|
(+ (point) pl)
|
|
(point-at-eol))))
|
|
(delete-region (point-at-bol) (point-at-eol))
|
|
(insert line "<before>" prefix "</before>")
|
|
(beginning-of-line 1))
|
|
(and (looking-at "[ \t]+") (replace-match "")))
|
|
(insert (if in-date "*** " "** "))
|
|
(end-of-line 1)
|
|
(insert "\n")
|
|
(unless sexp
|
|
(insert (org-agenda-get-some-entry-text
|
|
m 10 " " 'planning)
|
|
"\n")
|
|
(when (setq id
|
|
(if (org-bound-and-true-p
|
|
org-mobile-force-id-on-agenda-items)
|
|
(org-id-get m 'create)
|
|
(org-entry-get m "ID")))
|
|
(insert " :PROPERTIES:\n :ORIGINAL_ID: " id
|
|
"\n :END:\n")))))
|
|
(beginning-of-line 2))
|
|
(push (cons (file-name-nondirectory file) (md5 (buffer-string)))
|
|
org-mobile-checksum-files))
|
|
(message "Agenda written to Org file %s" file)))
|
|
|
|
;;;###autoload
|
|
(defun org-mobile-create-sumo-agenda ()
|
|
"Create a file that contains all custom agenda views."
|
|
(interactive)
|
|
(let* ((file (expand-file-name "agendas.org"
|
|
org-mobile-directory))
|
|
(file1 (if org-mobile-use-encryption
|
|
org-mobile-encryption-tempfile
|
|
file))
|
|
(sumo (org-mobile-sumo-agenda-command))
|
|
(org-agenda-custom-commands
|
|
(list (append sumo (list (list file1)))))
|
|
(org-mobile-creating-agendas t))
|
|
(unless (file-writable-p file1)
|
|
(error "Cannot write to file %s" file1))
|
|
(when sumo
|
|
(org-store-agenda-views))
|
|
(when org-mobile-use-encryption
|
|
(org-mobile-encrypt-file file1 file)
|
|
(delete-file file1))))
|
|
|
|
(defun org-mobile-encrypt-and-move (infile outfile)
|
|
"Encrypt INFILE locally to INFILE_enc, then move it to OUTFILE.
|
|
We do this in two steps so that remote paths will work, even if the
|
|
encryption program does not understand them."
|
|
(let ((encfile (concat infile "_enc")))
|
|
(org-mobile-encrypt-file infile encfile)
|
|
(when outfile
|
|
(copy-file encfile outfile 'ok-if-exists)
|
|
(delete-file encfile))))
|
|
|
|
(defun org-mobile-encrypt-file (infile outfile)
|
|
"Encrypt INFILE to OUTFILE, using `org-mobile-encryption-password'."
|
|
(shell-command
|
|
(format "openssl enc -aes-256-cbc -salt -pass %s -in %s -out %s"
|
|
(shell-quote-argument (concat "pass:" org-mobile-encryption-password))
|
|
(shell-quote-argument (expand-file-name infile))
|
|
(shell-quote-argument (expand-file-name outfile)))))
|
|
|
|
(defun org-mobile-decrypt-file (infile outfile)
|
|
"Decrypt INFILE to OUTFILE, using `org-mobile-encryption-password'."
|
|
(shell-command
|
|
(format "openssl enc -d -aes-256-cbc -salt -pass %s -in %s -out %s"
|
|
(shell-quote-argument (concat "pass:" org-mobile-encryption-password))
|
|
(shell-quote-argument (expand-file-name infile))
|
|
(shell-quote-argument (expand-file-name outfile)))))
|
|
|
|
(defun org-mobile-move-capture ()
|
|
"Move the contents of the capture file to the inbox file.
|
|
Return a marker to the location where the new content has been added.
|
|
If nothing new has been added, return nil."
|
|
(interactive)
|
|
(let* ((encfile nil)
|
|
(capture-file (expand-file-name org-mobile-capture-file
|
|
org-mobile-directory))
|
|
(inbox-buffer (find-file-noselect org-mobile-inbox-for-pull))
|
|
(capture-buffer
|
|
(if (not org-mobile-use-encryption)
|
|
(find-file-noselect capture-file)
|
|
(delete-file org-mobile-encryption-tempfile)
|
|
(setq encfile (concat org-mobile-encryption-tempfile "_enc"))
|
|
(copy-file capture-file encfile)
|
|
(org-mobile-decrypt-file encfile org-mobile-encryption-tempfile)
|
|
(find-file-noselect org-mobile-encryption-tempfile)))
|
|
(insertion-point (make-marker))
|
|
not-empty content)
|
|
(with-current-buffer capture-buffer
|
|
(setq content (buffer-string))
|
|
(setq not-empty (string-match "\\S-" content))
|
|
(when not-empty
|
|
(set-buffer inbox-buffer)
|
|
(widen)
|
|
(goto-char (point-max))
|
|
(or (bolp) (newline))
|
|
(move-marker insertion-point
|
|
(prog1 (point) (insert content)))
|
|
(save-buffer)
|
|
(set-buffer capture-buffer)
|
|
(erase-buffer)
|
|
(save-buffer)
|
|
(org-mobile-update-checksum-for-capture-file (buffer-string))))
|
|
(kill-buffer capture-buffer)
|
|
(when org-mobile-use-encryption
|
|
(org-mobile-encrypt-and-move org-mobile-encryption-tempfile
|
|
capture-file))
|
|
(if not-empty insertion-point)))
|
|
|
|
(defun org-mobile-update-checksum-for-capture-file (buffer-string)
|
|
"Find the checksum line and modify it to match BUFFER-STRING."
|
|
(let* ((file (expand-file-name "checksums.dat" org-mobile-directory))
|
|
(buffer (find-file-noselect file)))
|
|
(when buffer
|
|
(with-current-buffer buffer
|
|
(when (re-search-forward (concat "\\([0-9a-fA-F]\\{30,\\}\\).*?"
|
|
(regexp-quote org-mobile-capture-file)
|
|
"[ \t]*$") nil t)
|
|
(goto-char (match-beginning 1))
|
|
(delete-region (match-beginning 1) (match-end 1))
|
|
(insert (md5 buffer-string))
|
|
(save-buffer)))
|
|
(kill-buffer buffer))))
|
|
|
|
(defun org-mobile-apply (&optional beg end)
|
|
"Apply all change requests in the current buffer.
|
|
If BEG and END are given, only do this in that region."
|
|
(interactive)
|
|
(require 'org-archive)
|
|
(setq org-mobile-last-flagged-files nil)
|
|
(setq beg (or beg (point-min)) end (or end (point-max)))
|
|
|
|
;; Remove all Note IDs
|
|
(goto-char beg)
|
|
(while (re-search-forward "^\\*\\* Note ID: [-0-9A-F]+[ \t]*\n" end t)
|
|
(replace-match ""))
|
|
|
|
;; Find all the referenced entries, without making any changes yet
|
|
(let ((marker (make-marker))
|
|
(bos-marker (make-marker))
|
|
(end (move-marker (make-marker) end))
|
|
(cnt-new 0)
|
|
(cnt-edit 0)
|
|
(cnt-flag 0)
|
|
(cnt-error 0)
|
|
buf-list
|
|
id-pos org-mobile-error)
|
|
|
|
;; Count the new captures
|
|
(goto-char beg)
|
|
(while (re-search-forward "^\\* \\(.*\\)" end t)
|
|
(and (>= (- (match-end 1) (match-beginning 1)) 2)
|
|
(not (equal (downcase (substring (match-string 1) 0 2)) "f("))
|
|
(incf cnt-new)))
|
|
|
|
(goto-char beg)
|
|
(while (re-search-forward
|
|
"^\\*+[ \t]+F(\\([^():\n]*\\)\\(:\\([^()\n]*\\)\\)?)[ \t]+\\[\\[\\(\\(id\\|olp\\):\\([^]\n]+\\)\\)" end t)
|
|
(setq id-pos (condition-case msg
|
|
(org-mobile-locate-entry (match-string 4))
|
|
(error (nth 1 msg))))
|
|
(when (and (markerp id-pos)
|
|
(not (member (marker-buffer id-pos) buf-list)))
|
|
(org-mobile-timestamp-buffer (marker-buffer id-pos))
|
|
(push (marker-buffer id-pos) buf-list))
|
|
|
|
(if (or (not id-pos) (stringp id-pos))
|
|
(progn
|
|
(goto-char (+ 2 (point-at-bol)))
|
|
(insert id-pos " ")
|
|
(incf cnt-error))
|
|
(add-text-properties (point-at-bol) (point-at-eol)
|
|
(list 'org-mobile-marker
|
|
(or id-pos "Linked entry not found")))))
|
|
|
|
;; OK, now go back and start applying
|
|
(goto-char beg)
|
|
(while (re-search-forward "^\\*+[ \t]+F(\\([^():\n]*\\)\\(:\\([^()\n]*\\)\\)?)" end t)
|
|
(catch 'next
|
|
(setq id-pos (get-text-property (point-at-bol) 'org-mobile-marker))
|
|
(if (not (markerp id-pos))
|
|
(progn
|
|
(incf cnt-error)
|
|
(insert "UNKNOWN PROBLEM"))
|
|
(let* ((action (match-string 1))
|
|
(data (and (match-end 3) (match-string 3)))
|
|
(bos (point-at-bol))
|
|
(eos (save-excursion (org-end-of-subtree t t)))
|
|
(cmd (if (equal action "")
|
|
'(progn
|
|
(incf cnt-flag)
|
|
(org-toggle-tag "FLAGGED" 'on)
|
|
(and note
|
|
(org-entry-put nil "THEFLAGGINGNOTE" note)))
|
|
(incf cnt-edit)
|
|
(cdr (assoc action org-mobile-action-alist))))
|
|
(note (and (equal action "")
|
|
(buffer-substring (1+ (point-at-eol)) eos)))
|
|
(org-inhibit-logging 'note) ;; Do not take notes interactively
|
|
old new)
|
|
(goto-char bos)
|
|
(move-marker bos-marker (point))
|
|
(if (re-search-forward "^** Old value[ \t]*$" eos t)
|
|
(setq old (buffer-substring
|
|
(1+ (match-end 0))
|
|
(progn (outline-next-heading) (point)))))
|
|
(if (re-search-forward "^** New value[ \t]*$" eos t)
|
|
(setq new (buffer-substring
|
|
(1+ (match-end 0))
|
|
(progn (outline-next-heading)
|
|
(if (eobp) (org-back-over-empty-lines))
|
|
(point)))))
|
|
(setq old (and old (if (string-match "\\S-" old) old nil)))
|
|
(setq new (and new (if (string-match "\\S-" new) new nil)))
|
|
(if (and note (> (length note) 0))
|
|
;; Make Note into a single line, to fit into a property
|
|
(setq note (mapconcat 'identity
|
|
(org-split-string (org-trim note) "\n")
|
|
"\\n")))
|
|
(unless (equal data "body")
|
|
(setq new (and new (org-trim new))
|
|
old (and old (org-trim old))))
|
|
(goto-char (+ 2 bos-marker))
|
|
(unless (markerp id-pos)
|
|
(insert "BAD REFERENCE ")
|
|
(incf cnt-error)
|
|
(throw 'next t))
|
|
(unless cmd
|
|
(insert "BAD FLAG ")
|
|
(incf cnt-error)
|
|
(throw 'next t))
|
|
;; Remember this place so that we can return
|
|
(move-marker marker (point))
|
|
(setq org-mobile-error nil)
|
|
(save-excursion
|
|
(condition-case msg
|
|
(org-with-point-at id-pos
|
|
(progn
|
|
(eval cmd)
|
|
(if (member "FLAGGED" (org-get-tags))
|
|
(add-to-list 'org-mobile-last-flagged-files
|
|
(buffer-file-name (current-buffer))))))
|
|
(error (setq org-mobile-error msg))))
|
|
(when org-mobile-error
|
|
(switch-to-buffer (marker-buffer marker))
|
|
(goto-char marker)
|
|
(incf cnt-error)
|
|
(insert (if (stringp (nth 1 org-mobile-error))
|
|
(nth 1 org-mobile-error)
|
|
"EXECUTION FAILED")
|
|
" ")
|
|
(throw 'next t))
|
|
;; If we get here, the action has been applied successfully
|
|
;; So remove the entry
|
|
(goto-char bos-marker)
|
|
(delete-region (point) (org-end-of-subtree t t))))))
|
|
(save-buffer)
|
|
(move-marker marker nil)
|
|
(move-marker end nil)
|
|
(message "%d new, %d edits, %d flags, %d errors" cnt-new
|
|
cnt-edit cnt-flag cnt-error)
|
|
(sit-for 1)))
|
|
|
|
(defun org-mobile-timestamp-buffer (buf)
|
|
"Time stamp buffer BUF, just to make sure its checksum will change."
|
|
(with-current-buffer buf
|
|
(save-excursion
|
|
(save-restriction
|
|
(widen)
|
|
(goto-char (point-min))
|
|
(if (re-search-forward
|
|
"^\\([ \t]*\\)#\\+LAST_MOBILE_CHANGE:.*\n?" nil t)
|
|
(progn
|
|
(goto-char (match-end 1))
|
|
(delete-region (point) (match-end 0)))
|
|
(if (looking-at ".*?-\\*-.*-\\*-")
|
|
(forward-line 1)))
|
|
(insert "#+LAST_MOBILE_CHANGE: "
|
|
(format-time-string "%Y-%m-%d %T") "\n")))))
|
|
|
|
(defun org-mobile-smart-read ()
|
|
"Parse the entry at point for shortcuts and expand them.
|
|
These shortcuts are meant for fast and easy typing on the limited
|
|
keyboards of a mobile device. Below we show a list of the shortcuts
|
|
currently implemented.
|
|
|
|
The entry is expected to contain an inactive time stamp indicating when
|
|
the entry was created. When setting dates and
|
|
times (for example for deadlines), the time strings are interpreted
|
|
relative to that creation date.
|
|
Abbreviations are expected to take up entire lines, just because it is so
|
|
easy to type RET on a mobile device. Abbreviations start with one or two
|
|
letters, followed immediately by a dot and then additional information.
|
|
Generally the entire shortcut line is removed after action have been taken.
|
|
Time stamps will be constructed using `org-read-date'. So for example a
|
|
line \"dd. 2tue\" will set a deadline on the second Tuesday after the
|
|
creation date.
|
|
|
|
Here are the shortcuts currently implemented:
|
|
|
|
dd. string set deadline
|
|
ss. string set scheduling
|
|
tt. string set time tamp, here.
|
|
ti. string set inactive time
|
|
|
|
tg. tag1 tag2 tag3 set all these tags, change case where necessary
|
|
td. kwd set this todo keyword, change case where necessary
|
|
|
|
FIXME: Hmmm, not sure if we can make his work against the
|
|
auto-correction feature. Needs a bit more thinking. So this function
|
|
is currently a noop.")
|
|
|
|
|
|
(defun org-find-olp (path)
|
|
"Return a marker pointing to the entry at outline path OLP.
|
|
If anything goes wrong, the return value will instead an error message,
|
|
as a string."
|
|
(let* ((file (pop path))
|
|
(buffer (find-file-noselect file))
|
|
(level 1)
|
|
(lmin 1)
|
|
(lmax 1)
|
|
limit re end found pos heading cnt)
|
|
(unless buffer (error "File not found :%s" file))
|
|
(with-current-buffer buffer
|
|
(save-excursion
|
|
(save-restriction
|
|
(widen)
|
|
(setq limit (point-max))
|
|
(goto-char (point-min))
|
|
(while (setq heading (pop path))
|
|
(setq re (format org-complex-heading-regexp-format
|
|
(regexp-quote heading)))
|
|
(setq cnt 0 pos (point))
|
|
(while (re-search-forward re end t)
|
|
(setq level (- (match-end 1) (match-beginning 1)))
|
|
(if (and (>= level lmin) (<= level lmax))
|
|
(setq found (match-beginning 0) cnt (1+ cnt))))
|
|
(when (= cnt 0) (error "Heading not found on level %d: %s"
|
|
lmax heading))
|
|
(when (> cnt 1) (error "Heading not unique on level %d: %s"
|
|
lmax heading))
|
|
(goto-char found)
|
|
(setq lmin (1+ level) lmax (+ lmin (if org-odd-levels-only 1 0)))
|
|
(setq end (save-excursion (org-end-of-subtree t t))))
|
|
(when (org-on-heading-p)
|
|
(move-marker (make-marker) (point))))))))
|
|
|
|
(defun org-mobile-locate-entry (link)
|
|
(if (string-match "\\`id:\\(.*\\)$" link)
|
|
(org-id-find (match-string 1 link) 'marker)
|
|
(if (not (string-match "\\`olp:\\(.*?\\):\\(.*\\)$" link))
|
|
nil
|
|
(let ((file (match-string 1 link))
|
|
(path (match-string 2 link))
|
|
(table '((?: . "%3a") (?\[ . "%5b") (?\] . "%5d") (?/ . "%2f"))))
|
|
(setq file (org-link-unescape file table))
|
|
(setq file (expand-file-name file org-directory))
|
|
(setq path (mapcar (lambda (x) (org-link-unescape x table))
|
|
(org-split-string path "/")))
|
|
(org-find-olp (cons file path))))))
|
|
|
|
(defun org-mobile-edit (what old new)
|
|
"Edit item WHAT in the current entry by replacing OLD with NEW.
|
|
WHAT can be \"heading\", \"todo\", \"tags\", \"priority\", or \"body\".
|
|
The edit only takes place if the current value is equal (except for
|
|
white space) the OLD. If this is so, OLD will be replace by NEW
|
|
and the command will return t. If something goes wrong, a string will
|
|
be returned that indicates what went wrong."
|
|
(let (current old1 new1)
|
|
(if (stringp what) (setq what (intern what)))
|
|
|
|
(cond
|
|
|
|
((memq what '(todo todostate))
|
|
(setq current (org-get-todo-state))
|
|
(cond
|
|
((equal new "DONEARCHIVE")
|
|
(org-todo 'done)
|
|
(org-archive-subtree-default))
|
|
((equal new current) t) ; nothing needs to be done
|
|
((or (equal current old)
|
|
(eq org-mobile-force-mobile-change t)
|
|
(memq 'todo org-mobile-force-mobile-change))
|
|
(org-todo (or new 'none)) t)
|
|
(t (error "State before change was expected as \"%s\", but is \"%s\""
|
|
old current))))
|
|
|
|
((eq what 'tags)
|
|
(setq current (org-get-tags)
|
|
new1 (and new (org-split-string new ":+"))
|
|
old1 (and old (org-split-string old ":+")))
|
|
(cond
|
|
((org-mobile-tags-same-p current new1) t) ; no change needed
|
|
((or (org-mobile-tags-same-p current old1)
|
|
(eq org-mobile-force-mobile-change t)
|
|
(memq 'tags org-mobile-force-mobile-change))
|
|
(org-set-tags-to new1) t)
|
|
(t (error "Tags before change were expected as \"%s\", but are \"%s\""
|
|
(or old "") (or current "")))))
|
|
|
|
((eq what 'priority)
|
|
(when (looking-at org-complex-heading-regexp)
|
|
(setq current (and (match-end 3) (substring (match-string 3) 2 3)))
|
|
(cond
|
|
((equal current new) t) ; no action required
|
|
((or (equal current old)
|
|
(eq org-mobile-force-mobile-change t)
|
|
(memq 'tags org-mobile-force-mobile-change))
|
|
(org-priority (and new (string-to-char new))))
|
|
(t (error "Priority was expected to be %s, but is %s"
|
|
old current)))))
|
|
|
|
((eq what 'heading)
|
|
(when (looking-at org-complex-heading-regexp)
|
|
(setq current (match-string 4))
|
|
(cond
|
|
((equal current new) t) ; no action required
|
|
((or (equal current old)
|
|
(eq org-mobile-force-mobile-change t)
|
|
(memq 'heading org-mobile-force-mobile-change))
|
|
(goto-char (match-beginning 4))
|
|
(insert new)
|
|
(delete-region (point) (+ (point) (length current)))
|
|
(org-set-tags nil 'align))
|
|
(t (error "Heading changed in MobileOrg and on the computer")))))
|
|
|
|
((eq what 'body)
|
|
(setq current (buffer-substring (min (1+ (point-at-eol)) (point-max))
|
|
(save-excursion (outline-next-heading)
|
|
(point))))
|
|
(if (not (string-match "\\S-" current)) (setq current nil))
|
|
(cond
|
|
((org-mobile-bodies-same-p current new) t) ; no action necessary
|
|
((or (org-mobile-bodies-same-p current old)
|
|
(eq org-mobile-force-mobile-change t)
|
|
(memq 'body org-mobile-force-mobile-change))
|
|
(save-excursion
|
|
(end-of-line 1)
|
|
(insert "\n" new)
|
|
(or (bolp) (insert "\n"))
|
|
(delete-region (point) (progn (org-back-to-heading t)
|
|
(outline-next-heading)
|
|
(point))))
|
|
t)
|
|
(t (error "Body was changed in MobileOrg and on the computer")))))))
|
|
|
|
|
|
(defun org-mobile-tags-same-p (list1 list2)
|
|
"Are the two tag lists the same?"
|
|
(not (or (org-delete-all list1 list2)
|
|
(org-delete-all list2 list1))))
|
|
|
|
(defun org-mobile-bodies-same-p (a b)
|
|
"Compare if A and B are visually equal strings.
|
|
We first remove leading and trailing white space from the entire strings.
|
|
Then we split the strings into lines and remove leading/trailing whitespace
|
|
from each line. Then we compare.
|
|
A and B must be strings or nil."
|
|
(cond
|
|
((and (not a) (not b)) t)
|
|
((or (not a) (not b)) nil)
|
|
(t (setq a (org-trim a) b (org-trim b))
|
|
(setq a (mapconcat 'identity (org-split-string a "[ \t]*\n[ \t]*") "\n"))
|
|
(setq b (mapconcat 'identity (org-split-string b "[ \t]*\n[ \t]*") "\n"))
|
|
(equal a b))))
|
|
|
|
(provide 'org-mobile)
|
|
|
|
;; arch-tag: ace0e26c-58f2-4309-8a61-05ec1535f658
|
|
|
|
;;; org-mobile.el ends here
|
|
|