Commit Graph

1407 Commits

Author SHA1 Message Date
Bastien Guerry b50c465c17 Merge branch 'maint' 2012-09-26 10:56:20 +02:00
Bastien Guerry 440b9388d4 ob.el: Reintroduce ":results org" but using "#+BEGIN_SRC org", not "#+BEGIN_ORG"
* ob.el (org-babel-common-header-args-w-values)
(org-babel-insert-result): Reintroduce ":results org" but
using "#+BEGIN_SRC org", not "#+BEGIN_ORG".

* org.texi (results): Update documentation for ":results
drawer" and ":results org".
2012-09-26 10:56:16 +02:00
Bastien Guerry 1fa24e89ff Merge branch 'maint' 2012-09-26 00:44:05 +02:00
Bastien Guerry 6ea8cf7f27 org.texi (Column width and alignment): Fix typo
* org.texi (Column width and alignment): Fix typo.

Thanks to Erich Neuwirth for spotting this.
2012-09-26 00:38:32 +02:00
Bastien Guerry a65b5bd36c New command `org-copy' to copy a subtree/region
* org.el (org-refile-keep): New variable.
(org-copy): New command to copy notes.
(org-refile): New parameter msg to override the "Refile"
string in the default prompt.
(org-mode-map): Bind "C-c M-w" to `org-copy'.

* org.texi (Refile and copy): Document the new command `org-copy'.

* orgguide.texi (Refile and copy): Ditto.

Thanks to Kalev Takkis who triggered this change.
2012-09-23 11:42:41 +02:00
Bastien Guerry 5a5abba09f org.texi (Activation): Point to the "Conflicts" section
* org.texi (Activation): Point to the "Conflicts" section.
2012-09-21 11:08:15 +02:00
Bastien Guerry 7e5b746b66 org.texi (Activation): Point to the "Conflicts" section
* org.texi (Activation): Point to the "Conflicts" section.
2012-09-21 11:07:34 +02:00
Bastien Guerry 5abc82b3ab Merge branch 'maint' 2012-09-21 11:02:15 +02:00
Bastien Guerry 6cb676f65a org.texi (Conflicts): Mention filladapt.el in the list of conflicting packages
* org.texi (Conflicts): Mention filladapt.el in the list of
conflicting packages.

Thanks to Anthony Lander for the hook.
2012-09-21 11:02:00 +02:00
Bastien Guerry 39da4f455a Merge branch 'maint' 2012-09-18 16:22:03 +02:00
Bastien Guerry c19364464a org.texi (Activation): Adding org-mode to `auto-mode-alist' is not needed for versions of Emacs > 22.1
* org.texi (Activation): Adding org-mode to `auto-mode-alist'
is not needed for versions of Emacs > 22.1.

Thanks to Robert P. J. Day for suggesting this.
2012-09-18 16:21:36 +02:00
Michael Brand 137bfd0aa7 org.texi: Mention Calc defmath
* org.texi (Formula syntax for Calc): Add a sentence to mention Calc
defmath.
2012-09-12 09:50:59 +02:00
Bastien Guerry cc1e2cf6f6 Merge branch 'maint' 2012-09-04 00:07:00 +02:00
Bastien Guerry 320a1201cd org.texi (History and Acknowledgments): Fix typo
* org.texi (History and Acknowledgments): Fix typo.
2012-09-04 00:00:33 +02:00
Bastien Guerry c02fe61361 Merge branch 'maint' 2012-09-03 12:37:18 +02:00
Bastien Guerry 74c57911a7 org.texi (History and Acknowledgments): Add my own acknowledgments
* org.texi (History and Acknowledgments): Add my own acknowledgments.
2012-09-03 12:37:10 +02:00
Bastien Guerry f43c8c8100 Merge branch 'maint' 2012-09-02 13:45:18 +02:00
Bastien Guerry f011496ceb `k' now calls org-agenda-capture from agenda. Also add `org-capture-use-agenda-date' option.
* org-capture.el (org-capture-use-agenda-date): New option.
(org-capture): Use it.

* org-agenda.el (org-agenda-capture): New command.
(org-agenda-mode-map): Bind it to `k'.
(org-agenda-menu): Add it to the menu.

* org.texi (Agenda commands): Document the new command and the
new option.

Thanks to Eric Abrahamsen who suggested this change, along with
other merging about bulk actions.
2012-09-02 12:52:38 +02:00
Bastien Guerry 916c300414 org-agenda.el: Delete `org-agenda-action'
* org-agenda.el (org-agenda-action, org-agenda-do-action):
Delete.
(org-agenda-mode-map): Delete related keys.

* org.texi (Agenda commands): Delete `org-agenda-action'
section.
(Agenda commands): Reorder.  Document `*' to toggle persistent
marks.
2012-09-02 11:20:01 +02:00
Bastien Guerry 0a78e90362 Merge branch 'maint' 2012-08-28 13:39:45 +02:00
Bastien Guerry f6af827013 doc/org.texi: Fix typos in the manual
* org.texi (Agenda dispatcher): Mention
`org-toggle-agenda-sticky'.
(Agenda commands, Exporting Agenda Views): Fix typo.
2012-08-28 13:14:46 +02:00
Achim Gratz 6c9a6ae8d1 Merge branch 'maint' 2012-08-26 20:02:59 +02:00
Achim Gratz ac0667b841 Makefile: add description of ORG_ADD_CONTRIB to info documentation
* doc/org.texi: Add description of ORG_ADD_CONTRIB to info
  documentation.  Add link to Worg for more details.
2012-08-26 20:01:24 +02:00
Achim Gratz 57c4a4aa07 Merge branch 'maint' 2012-08-26 19:06:39 +02:00
Achim Gratz c32d456f72 Makefile: Improve documentation.
* doc/org.texi: Clarify installation procedure.  Provide link to the
  build system description on Worg.
2012-08-26 17:50:10 +02:00
Achim Gratz db0e306658 Merge branch 'maint' 2012-08-26 15:28:47 +02:00
Achim Gratz bf352eceda Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout
* Makefile: Include default.mk and targets.mk from mk/ where they've
  been moved to.

* README_maintainer: Rename utils to make throughout.

* doc/Makefile: Rename utils to make throughout.

* doc/org.texi: Remove reference to utils/, x11idle.c is now in
  contrib/scripts.

* mk/make_emacs_changelog: Add mk/ to list of directories not to be
  reported in Emacs' ChangeLog.  Also retain utils/ and re-add
  UTILITIES; add a comment explaining why these need to stay.

* mk/default.mk: Rename utils to make throughout.  Include version.mk
  from mk/ where it's been moved to.

* mk/targets.mk: Rename utils to make throughout.

* mk/server.mk: Rename utils to make throughout.  Only put those files
  from mk/ into the archives that are needed outside the server:
  default.mk targets.mk version.mk and org-fixup.el.

* lisp/org-compat.el: Rename utils to make throughout.

* .gitignore:  Rename utils to make throughout.
2012-08-26 15:27:19 +02:00
Yann Hodique e48d77aa98 org-taskjuggler.el: Update doc to reflect latest changes 2012-08-26 09:54:57 +02:00
Michael Brand efab563317 org.texi: Mention when a table header is mandatory
* org.texi (Column formulas): Add a sentence to be more explicit about
when a table header is mandatory.
2012-08-24 19:53:04 +02:00
Bastien Guerry 10dbdf5fc2 Update the handling of agenda/capture keys contextualization.
* org.el (org-contextualize-keys): Rename from
`org-contextualize-agenda-or-capture'.  Fix normalization to
handle empty key replacement string.
(org-contextualize-validate-key): Rename from
`org-contexts-validate'.  Allow checking against a custom
function.

* org-agenda.el (org-agenda-custom-commands-contexts): Update.
(org-agenda): Use `org-contextualize-keys'.

* org-capture.el (org-capture-templates-contexts): Ditto.

* org.texi (Templates in contexts, Setting Options): Update to
reflect changes in how contexts options are processed.
2012-08-24 12:18:05 +02:00
Bastien Guerry 6c94ea0518 Implement key replacement depending on the contexts.
* org.el (org-contextualize-agenda-or-capture): Handle key
replacement depending on the contexts.

* org-capture.el (org-capture-templates-contexts): Allow to
use the context as a way to replace one capture template by
another one.

* org-agenda.el (org-agenda-custom-commands-contexts): Allow
to use the context as a way to replace one agenda custom
command by another one.

* org.texi (Templates in contexts): Document the new structure
of the variables `org-agenda-custom-commands-contexts' and
`org-capture-templates-contexts'.

In the setup below, X is not a real capture template, it is just
an alias to templates A and B in .txt and .el files.  A and B are
deactivated by default in all files.

(setq org-capture-templates
      '(("X" "Nothing but an alias")
	("A" "AAAA" entry (file+headline [...]))
	("B" "BBBB" entry (file+headline [...]))))

(setq org-capture-templates-contexts
      '(("A" "A" ((not-in-file . ".*")))
	("B" "B" ((not-in-file . ".*")))
	("X" "A" ((in-file . "\\.txt")))
	("X" "B" ((in-file . "\\.el")))))

Thanks to Carsten for suggesting this "key-replacement" idea!
2012-08-24 12:17:58 +02:00
Bastien Guerry 0c8e87b8d2 Rename UTILITIES/ to utils/ 2012-08-23 12:47:10 +02:00
Bastien Guerry d378c7b41b Implement context filtering for agenda commands and capture templates.
* org.el (org-contextualize-agenda-or-capture)
(org-rule-validate): New functions, implement context
filtering for agenda commands and capture templates.

* org-agenda.el (org-agenda-custom-commands-contexts): New
option.
(org-agenda): Use it.

* org-capture.el (org-capture-templates-contexts): New option.
(org-capture-select-template): Use it.

* org.texi (Templates in contexts): Document the new option
`org-capture-templates-contexts'.
(Storing searches): Document the new option
`org-agenda-custom-commands-contexts'.

This idea comes from Sylvain Rousseau, who implemented a similar
feature with org-context.el: https://github.com/thisirs/org-context

This implementation is a bit simpler and more general.  Simpler
because it relies on existing templates, no need to define other
contextual ones.  More general because contexts can be defined
wrt files and modes.

Thanks *very much* to Sylvain for paving the way -- certainly a
great addition to Org.
2012-08-23 11:08:47 +02:00
Charles b0dc7ec164 org.texi (Advanced features): Fix error in table
* org.texi (Advanced features): Fix error in table.

TINYCHANGE
2012-08-22 00:12:21 +02:00
Bastien Guerry cd5fa2396c org.texi (Formula syntax for Lisp): Reformat
* org.texi (Formula syntax for Lisp): Reformat.
2012-08-21 18:28:35 +02:00
Nicolas Goaziou 9b4f5a2fc2 org.texi: Fix reference to an unknown variable
* doc/org.texi (Literal examples): Remove reference to unknown
  `org-export-latex-minted' variable. Also simplify footnote since
  `org-export-latex-listings' documentation is exhaustive already.
2012-08-20 16:53:21 +02:00
Nicolas Goaziou 445a90ceeb Update documentation with regards to lists
* doc/org.texi (Plain lists): Remove reference to now hard-coded
  `bullet' automatic rule.
2012-08-18 10:00:58 +02:00
François Allisson 97685b6b60 org.texi: Fix typo
* doc/org.texi: Remove extra curly bracket.

TINYCHANGE
2012-08-05 16:29:20 +02:00
Bastien Guerry de271e3751 Introduce a new special property CLOCKSUM_T for today's clocked time.
* org.el (org-special-properties): New special property
CLOCKSUM_T.
(org-entry-properties): Handle the new special property.

* org-colview.el (org-columns): Handle a new special property
CLOCKSUM_T.
(org-agenda-colview-summarize, org-agenda-colview-compute):
Ditto.

* org-clock.el (org-clock-sum-today): New function.
(org-clock-sum): New argument PROPNAME to set a custom text
property instead of :org-clock-minutes.

* org.texi (Special properties, Column attributes)
(Agenda column view): Document the new special property
CLOCKSUM_T.

Thanks to Brian Wood who asked a question wrt this.
2012-08-05 11:12:04 +02:00
Bastien Guerry 21ec0159b8 org-capture.el: New template %l to insert the literal link.
* org-capture.el (org-capture-templates): New template %l to
insert the literal link pointing at the current buffer.

* org.texi (Template expansion): Document the new %l template.

Thanks to Eric Abrahamsen for this idea.
2012-08-02 17:06:22 +02:00
Bastien Guerry aa490ffa04 Small doc fix.
* org.texi (Fast access to TODO states): Fix documentation
about allowed characters for fast todo selection.

* org.el (org-todo-keywords): Ditto.

This fixes this wrong change here:
http://orgmode.org/w/?p=org-mode.git;a=commit;h=b6cb72
2012-08-02 11:59:27 +02:00
Bastien Guerry a865abb5fe Let's a :APPT_WARNTIME: property override `appt-message-warning-time' in `org-agenda-to-appt'.
* org.el (org-speed-commands-default): New speedy command to
quickly add the :APPT_WARNTIME: property.

* org-agenda.el (org-agenda-to-appt): Use the :APPT_WARNTIME:
property to override `appt-message-warning-time' when adding
an appointment from an entry.

* org.texi (Weekly/daily agenda): Mention APPT_WARNTIME and
its use in `org-agenda-to-appt'.

This feature has been suggested, along with preliminary patches,
by Ivan Kanis.  Thanks!
2012-08-01 16:05:47 +02:00
Bastien Guerry 79ac009b58 Update the manual wrt comments.
* org.texi (Comment lines): Update wrt comments.

* orgguide.texi (Comment lines): Update wrt comments.
2012-08-01 14:35:13 +02:00
Bastien Guerry ba10c6a27e org.texi: Small documentation fix. 2012-07-30 09:35:37 +02:00
Bastien Guerry f250f6beba New keybinding `C-c C-x C-z' for `org-resolve-clocks'.
* org.el (org-mode-map): Bind `org-resolve-clocks' to `C-c C-x C-z'.

* org.texi (Resolving idle time): Document new keybinding.

Thanks to Joseph Thomas for suggesting this.
2012-07-28 01:23:37 +02:00
Bastien Guerry b86a6f6f34 S-M-<up/down> now adjusts previous/next clock when hit on clock timestamps.
* org.el (org-clock-history, org-clock-adjust-closest): New
variables.
(org-timestamp-change): Maybe adjust the next or previous
clock in `org-clock-history'.
(org-shiftmetaup, org-shiftmetadown): On clock logs, update
the timestamp at point and adjust the next or previous clock
in `org-clock-history', when possible.

* org.texi (Clocking commands): Document the use of
S-M-<up/down> on clock timestamps.

Thanks to Joseph Thomas who suggested this.
2012-07-27 17:29:29 +02:00
Giovanni Ridolfi 12a53c7161 org.texi: Update the key sequence for `org-clock-in-last' and `org-clock-cancel'.
* doc/org.texi (org-clock-in-last and org-clock-cancel): Update the
  defkeys.

TINYCHANGE

After commit fea1b82bef the manual has not been updated, let's do it now.
2012-07-24 17:05:16 +02:00
Bastien Guerry b6cb722377 Explicitely says only letters are supported as fast TODO selection keys.
* org.texi (Fast access to TODO states): Explicitely says only
letters are supported as fast TODO selection keys.

* org.el (org-todo-keywords): Ditto.

Thanks to Samuel Wales for pointing at this.
2012-07-14 09:15:50 +02:00
Bastien Guerry ef3d4b5965 org.el: Allow %(my-function) as a specifier in abbreviated links.
* org.el (org-link-expand-abbrev): Implement "%(my-function)"
as a new specifier.  Update the docstring.

* org.texi (Link abbreviations): Illustrate the use of the
"%h" specifier.  Document the new "%(my-function)" specifier.

Thanks to Takaaki ISHIKAWA who came all the way down from Tokyo
to Paris and raised a not-so-distant issue: "could we translate
emails from the mailing list and have a URI for each translated
email?"  See the update in the manual for an answer.
2012-07-13 18:22:45 +02:00
Bastien Guerry 3528fc6b42 Implement continuous clocking. Small other improvements. Update documentation.
* org.el (org-mode-map): Add `C-c C-x C-I' as a keybinding for
`org-clock-in-last'.

* org-clock.el (org-clock-continuously): New option.
(org-clock-in): Three universal prefix arguments set
`org-clock-continuously' to `t' temporarily.
(org-clock-in-last): Fix call to `org-clock-select-task' and
support continuous clocking.
(org-clock-out-time): New variable.
(org-clock-out): set `org-clock-out-time' when clocking out.
Small docstring rewriting.
(org-clock-remove-empty-clock-drawer): Fix "invalid search
bound" bug when trying to delete empty logbook drawer.
(org-clock-cancel): If the clock log is gone, send a warning
instead of deleting the region that is supposed to contain it.

* org.texi (Clocking commands): New cindex.
(Clocking commands): Update documentation for `org-clock-in'.
Document `org-clock-in-last'.  Mention `org-clock-out' and
`org-clock-in-last' as commands that can be globally bound.
(Resolving idle time): Document continuous clocking.
2012-07-12 14:04:54 +02:00