Commit Graph

1813 Commits

Author SHA1 Message Date
Bastien Guerry 521d47b019 Merge branch 'maint' 2013-02-09 11:59:27 +01:00
Bastien Guerry 1056fc3f60 org.texi (Progress logging, Checkboxes): Fix typos
* org.texi (Progress logging, Checkboxes): Fix typos.

Thanks to Gregory Benjamin for this.
2013-02-09 11:59:17 +01:00
Bastien Guerry a77d3f0bcd Merge branch 'maint' 2013-02-09 11:51:56 +01:00
Gregory Benjamin 57b893a4db Fix typos in orgguide.texi. 2013-02-09 11:51:27 +01:00
Bastien Guerry 8ee885cb97 org.texi (References): Small enhancement
* org.texi (References): Small enhancement.
2013-02-07 09:12:22 +01:00
Bastien Guerry e81ed15d7d Merge branch 'maint' 2013-01-30 17:46:54 +01:00
Bastien Guerry 4890bbed8c org.texi (References): Clarify an example
* org.texi (References): Clarify an example.

Thanks to Xue Fuqiao, Eric S Fraga and H. Dieter Wilhelm
for sorting this out.
2013-01-30 17:46:35 +01:00
Bastien Guerry 751e4e4202 org.texi (Column width and alignment): Make the example visually more clear
* org.texi (Column width and alignment): Make the example
visually more clear.

Thanks to Joost Helberg for suggesting this.
2013-01-26 11:47:14 +01:00
Bastien Guerry af49713a95 Merge branch 'maint' 2013-01-24 12:27:59 +01:00
Bastien Guerry d11c9acc66 org.texi (Installation): Enhance instructions again
* org.texi (Installation): Enhance instructions again.
2013-01-24 12:27:55 +01:00
Bastien Guerry a9da9c6550 Merge branch 'maint' 2013-01-23 14:58:33 +01:00
Bastien Guerry a7c0ea1a86 org.texi (Org-Plot): Update link
* org.texi (Org-Plot): Update link.

Thanks to Xue Fuqiao for reporting this.
2013-01-23 14:58:29 +01:00
Bastien Guerry e79349ad78 org.texi (Built-in table editor): Tiny enhancement
* org.texi (Checkboxes, Radio lists): Fix typos.

Thanks to Xue Fuqiao for pointing this.
2013-01-22 16:03:19 +01:00
Bastien Guerry 0aae38f8fa Merge branch 'maint' 2013-01-22 16:01:01 +01:00
Bastien Guerry ecd9a1cc21 org.texi (Checkboxes, Radio lists): Fix typos
* org.texi (Checkboxes, Radio lists): Fix typos.
2013-01-22 16:00:56 +01:00
Yasushi SHOJI 0499f0a939 org-clock.el: New option `org-clock-x11idle-program-name'
* org-clock.el (org-clock-x11idle-program-name): New option.
(org-x11idle-exists-p, org-x11-idle-seconds): Use it.

* org.texi (Resolving idle time): Document
`org-clock-x11idle-program-name'.

Debian and other OSes already have a program called 'xprintidle',
which does the same thing as x11idle. It also handles the DPMS bug[1]
some version of X servers have.

In order to use an alternative, introduce a customizable variable
'org-clock-x11idle-program-name' to hold the actual command name.

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502226
2013-01-11 23:16:45 +01:00
Bastien Guerry 9265513c5e Merge branch 'maint' 2013-01-11 13:34:30 +01:00
Bastien Guerry d5268b051b org.texi (Installation): Simplify
* org.texi (Installation): Simplify.
2013-01-11 13:32:34 +01:00
Eric Schulte f8f5489071 mention elisp as special rowname case.
* doc/org.texi (rownames): Mention elisp as special rowname case.
2013-01-09 10:22:13 -07:00
Bastien Guerry 81959fc8c0 Merge branch 'maint' 2013-01-09 12:53:04 +01:00
François Allisson 31e765a105 org.texi: Update documentation on internal link handling
* org.texi (Handling links): Update the mention to the
obsolete variable `org-link-to-org-use-id' with a mention to
the newer variable `org-id-link-to-org-use-id'.  Mention the
need to load the org-id library.

TINYCHANGE
2013-01-09 12:52:52 +01:00
Bastien Guerry 832b6e66ea Merge branch 'maint' 2013-01-08 22:33:52 +01:00
Bastien Guerry 8c5a46c35d doc/org.texi: Update copyright year. 2013-01-08 22:33:33 +01:00
Bastien Guerry 57f4e17f99 Merge branch 'maint' 2013-01-08 16:19:39 +01:00
Bastien Guerry c8c217aa55 org.texi: Document `org-mark-element' and `org-mark-subtree'
* org.texi (Structure editing): Document `org-mark-element'
and `org-mark-subtree'.
(Tag inheritance): Document `org-agenda-use-tag-inheritance'.

Thanks to Nathaniel Cunningham for requesting this.
2013-01-08 16:19:31 +01:00
Bastien Guerry 679dce0fda Merge branch 'maint' 2013-01-08 15:26:17 +01:00
Bastien Guerry 31c1aeabae Various small fixes 2013-01-08 15:26:04 +01:00
Bastien Guerry 6c3ef62266 Merge branch 'maint'
Conflicts:
	doc/orgguide.texi
2013-01-08 12:11:08 +01:00
Bastien Guerry 2d81219147 doc/orgguide.texi: Update menu 2013-01-08 12:09:39 +01:00
Eric Schulte 5328e1cd02 no hline pre-processing for elisp code blocks
* doc/org.texi (hlines): Note that :hline has no effect for Emacs Lisp
  code blocks.
2013-01-07 23:38:15 -07:00
Bastien Guerry 5c8cc17d39 Merge branch 'maint' 2013-01-07 18:21:39 +01:00
Bastien Guerry 571d80dad9 org.texi (Pushing to MobileOrg): Fix footnote about the use of symbolic links in `org-directory'
* org.texi (Pushing to MobileOrg): Fix footnote about the use
of symbolic links in `org-directory'.
2013-01-07 18:21:29 +01:00
Bastien Guerry b54d6f5965 Merge branch 'maint'
Conflicts:
	lisp/org-agenda.el
	lisp/org.el
	testing/lisp/test-org-element.el
2013-01-07 16:19:37 +01:00
Bastien Guerry b27a020a83 `org-float' is now obsolete
* org-agenda.el (org-float): Don't alias `org-float'.

* org.texi (Timestamps, Deadlines and scheduling): Use
`diary-float' instead of the now obsolete alias `org-float'.

* test-org-element.el
(test-org-element/timestamp-interpreter): Ditto.
2013-01-07 13:01:36 +01:00
Bastien Guerry b43ee80cb8 Merge branch 'maint' 2013-01-06 15:10:52 +01:00
Bastien Guerry 50ba6031c4 Backport patch from revno#r111145 from the Emacs-24 branch 2013-01-06 15:05:35 +01:00
Bastien Guerry 0c75ce3034 Merge branch 'maint' 2013-01-06 14:56:50 +01:00
Bastien Guerry 76684b5606 org.texi (Pushing to MobileOrg): Mention that `org-directory' should not contain symbolic links
* org.texi (Pushing to MobileOrg): Mention that `org-directory'
should not contain symbolic links.

Thanks to James Harkins for reporting this problem.
2013-01-06 14:56:36 +01:00
Bastien Guerry 5352d9b155 Merge branch 'maint' 2013-01-06 07:40:36 +01:00
Bastien Guerry 129ecf99fa org.texi (TODO basics): Fix description of TODO keywords cycling
* org.texi (TODO basics): Add `org-use-fast-todo-selection' to
the variable index.
(TODO basics): Fix description of TODO keywords cycling.

Thanks to Brian van den Broek for reporting this.
2013-01-06 07:36:36 +01:00
Bastien Guerry 8a401f8175 Merge branch 'maint' 2013-01-06 06:17:18 +01:00
Bastien Guerry bbc9ea09e4 Revert "Backport revno#111138 from the emacs-24 branch"
This reverts commit 7fe67bb942.

Thanks to Takaaki ISHIKAWA for reporting this.
Also see http://mid.gmane.org/fkobh39l4z.fsf%40fencepost.gnu.org
2013-01-06 06:15:30 +01:00
Bastien Guerry 5217d18a7a Merge branch 'maint' 2013-01-05 18:39:48 +01:00
Bastien Guerry 7fe67bb942 Backport revno#111138 from the emacs-24 branch
* org.texi (Advanced features): Add missing argument for @item.
(Property searches): Use @backslashchar{} in macro argument.
2013-01-05 18:39:40 +01:00
Bastien Guerry 576f43b743 Merge branch 'maint' 2013-01-04 17:23:27 +01:00
Bastien Guerry 5e17a990f5 org.texi (Storing searches): Add index entries and a note about {*-tree} agenda views
* org.texi (Storing searches): Add index entries and a note
about {*-tree} agenda views.

Thanks to Alan Schmitt for indirectly pointing at this doc problem.
2013-01-04 17:14:25 +01:00
Bastien Guerry 60b23bdeac Merge branch 'maint'
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
Bastien Guerry 98cd4687a2 Update copyright years.
Happy new year!
2013-01-01 16:04:24 +01:00
Michael Brand a77442b37b Use nan for empty fields in Calc formulas
* doc/org.texi (Formula syntax for Calc): Add explanation and example
for empty field.
* lisp/org-table.el (org-table-eval-formula): Use `keep-empty' in more
places.
(org-table-make-reference): Use nan (not a number) for empty fields in
Calc formulas.
* testing/lisp/test-org-table.el: Adapt expected for several
ert-deftest.
(test-org-table/empty-field): New examples dealing with empty fields.
(test-org-table/copy-field): New ert-deftest with examples dealing with
empty fields.

This makes it possible to write spreadsheet Calc formulas that check
for empty fields:  To sum the first two columns unless one or both
empty:
$3 = if("$1" = "nan" || "$2" = "nan", string(""), $1 + $2); E
2012-12-29 14:33:52 +01:00
Michael Brand f5dd9a8a7a Add ERTs for basic spreadsheet functionality
* doc/org.texi (Formula syntax for Calc): Extend explanations of
format specifiers.
* testing/lisp/test-org-table.el: Various new ert-deftest, mark with
TODO what needs to be fixed.
2012-12-29 14:33:52 +01:00
Bastien Guerry 0bca49801e org-clock.el: Implement a new parameter :wstart to define the week start day
* org-clock.el (org-clock-special-range): New parameter
'weekstart to define the week start day.
(org-clock-special-range, org-dblock-write:clocktable)
(org-dblock-write:clocktable, )
(org-clocktable-write-default, org-clocktable-steps)
(org-clock-get-table-data): Use the new parameter.
(org-clocktable-defaults): Set monday as the starting day of
the week by setting :wstart to 1.

* org.texi (The clock table): Document :wstart as a way to set
the starting day of the week.

Thanks to Raghavendra D Prabhu for suggesting this feature.
2012-12-29 12:35:18 +01:00
Bastien Guerry 5fa52d9a93 org.el: Add new startup keywords
* org.el (org-startup-options): New startup keywords.
(org-log-into-drawer): Update docstring to explain how to set this
variable through the startup keyword "logdrawer" and "nologdrawer".
(org-log-states-order-reversed): Document the new startup keywords
"logstatesreversed" and "nologstatesreversed".

* org.texi (In-buffer settings): Document new startup keywords.
Thanks to John J Foerch for this idea.
2012-12-23 18:51:24 +01:00
Bastien Guerry e815ab5f8e Merge branch 'master-fixes' 2012-12-23 00:34:49 +01:00
Bastien Guerry b6eede54b2 Merge branch 'maint' 2012-12-23 00:34:42 +01:00
Bastien Guerry 6b9d77eb8c orgguide.texi (Multi-state workflows, Agenda commands): Fix missing dashes
* orgguide.texi (Multi-state workflows, Agenda commands): Fix
missing dashes.
2012-12-22 23:30:59 +01:00
Bastien Guerry c846f024c1 Fix more instances of missing dashes. 2012-12-22 23:29:03 +01:00
Bastien Guerry 6e1521f13b org.texi and orgguide.texi: Hyphen and dash fixes.
See revno 111060 by Paul Eggert from the emacs-24 bzr branch.
2012-12-22 21:30:27 +01:00
Bastien Guerry 5987fd5f08 org.texi (Include files): Tiny formatting fix
* org.texi (Include files): Tiny formatting fix.
2012-12-22 19:49:00 +01:00
Bastien Guerry beea46fab5 Merge branch 'maint' 2012-12-15 06:39:42 +01:00
Bastien Guerry 0b44eb6961 Add doclicense.texi to include the GNU FDL license and fix the copyright notice.
The GNU FDLv1.3 is now included in both the manual and the guide.
The Back-Cover Texts does not mention that you can buy copies from
the FSF as this is not true.
2012-12-15 06:39:33 +01:00
Bastien Guerry 2dbd84ecaa Merge branch 'maint' 2012-12-14 11:48:08 +01:00
Bastien Guerry 6f5b4a8b73 orgguide.texi: Fix the copyright notice.
See http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=cd2496
for explanations on the same change for org.texi.
2012-12-14 11:48:02 +01:00
Bastien Guerry 6af6e957df Merge branch 'maint' 2012-12-14 11:35:57 +01:00
Bastien Guerry cd249629de org.texi: Update copyright notice.
There are no invariant sections and no cover texts.

See http://www.gnu.org/prep/maintain/html_node/License-Notices-for-Documentation.html
for details on why we don't need invariant sections and cover texts.
2012-12-14 11:35:45 +01:00
Bastien Guerry 31d24aa213 Merge branch 'maint' 2012-12-13 11:58:54 +01:00
Bastien Guerry 82db0aab3b org.texi: Fix typos. 2012-12-13 11:58:42 +01:00
Bastien Guerry 47ea16660e Merge branch 'maint' 2012-12-12 10:14:59 +01:00
Bastien Guerry 1c13115780 org.texi: Small reformatting.
* org.texi (Summary, Code block specific header arguments)
(Code block specific header arguments)
(Header arguments in function calls, var, noweb)
(Results of evaluation, Code evaluation security): Small
reformatting: add a blank line before some example.
2012-12-12 08:54:30 +01:00
Bastien Guerry 7abad97db7 org.texi: Fix indendation of Elisp code examples.
* org.texi (System-wide header arguments)
(Header arguments in Org mode properties, Conflicts)
(Dynamic blocks, Using the mapping API): Fix indendation of
Elisp code examples.
2012-12-12 08:50:00 +01:00
Bastien Guerry 48703624d5 Merge branch 'maint'
Conflicts:
	doc/org.texi
2012-12-09 23:48:29 +01:00
Bastien Guerry e5ea08f01b doc/org.texi: Fix minor whitespace issues after "." in manual.
See revno: 110998 by Paul Eggert in Emacs repo.

revno: 110998
fixes bug: http://debbugs.gnu.org/12973
committer: Paul Eggert <eggert@cs.ucla.edu>
branch nick: emacs-24
timestamp: Wed 2012-12-05 14:27:56 -0800
message: Fix minor whitespace issues after "." in manual.
2012-12-09 23:46:25 +01:00
Ivan Vilata i Balaguer 513507ee74 Allow relative times in clocktable tstart and tend options
* lisp/org-clock.el (org-clock-get-table-data): Pass tstart and tend
time strings through `org-matcher-time' to allow relative times besides
absolute ones, convert result to encoded time.
* doc/org.texi (The clock table): Document acceptance of relative times
in tstart and tend, link to syntax description and provide example.

Inspired in the original relative times proposal by Ilya Shlyakhter,
this is less invasive and it doesn't modify core functions, thus it
avoids the original's infinite recursion when hitting normal dates in
other locations.

TINYCHANGE
2012-11-30 16:07:13 +01:00
Ryo TAKAISHI fb143b6787 org-capture: Expand keywords within %(sexp) placeholder in template
* lisp/org-capture.el: (org-capture--expand-keyword-in-embedded-elisp): New function.
(org-capture-expand-embedded-elisp): Use new function.
2012-11-05 01:29:25 +01:00
Bastien Guerry 70e4a89a5d Merge branch 'maint' 2012-10-27 21:44:21 +02:00
Bastien Guerry 4aa416876b org.texi (Comment lines): Fix description of the comment syntax
* org.texi (Comment lines): Fix description of the comment
syntax.

Thanks to Rafael Laboissiere for reporting this.
2012-10-27 21:44:09 +02:00
Bastien Guerry 4c3527d2e6 Merge branch 'maint' 2012-10-27 09:08:35 +02:00
Bastien Guerry 1fe4e9ecc7 org.texi (Installation): Mention "make test" in the correct section
* org.texi (Installation): Mention "make test" in the correct
section.

Thanks to Uvius for reporting this problem.
2012-10-27 09:08:28 +02:00
Bastien Guerry a29de08ff7 Merge branch 'maint' 2012-10-26 15:59:10 +02:00
Bastien Guerry acbbe2d5b2 Fix typo in refcard and whitespaces in org.texi. 2012-10-26 15:59:06 +02:00
Bastien Guerry 66cc45e670 org.texi: Delete trailing whitespaces. 2012-10-24 15:00:27 +02:00
Jarmo Hurri e375cfd834 Table lookup functions
* lisp/org-table.el: added macro org-define-lookup-function and the
calls to this macro that generate the lookup functions
org-lookup-first, org-lookup-last and org-lookup-all
* doc/org.texi: documented lookup functions
2012-10-24 14:59:33 +02:00
Nicolas Goaziou 93ebf24758 Merge branch 'maint' 2012-10-15 22:32:25 +02:00
Nicolas Goaziou 1fb3cca7c0 Allow to call `org-show-todo-tree' with an argument
* lisp/org.el (org-sparse-tree): Allow to call `org-show-todo-tree'
  with an argument.
* doc/orgcard.tex: Fix keybindings about `org-show-todo-tree'.
2012-10-15 22:31:37 +02:00
Nicolas Goaziou a67ed0f59d Merge branch 'maint' 2012-10-15 21:33:44 +02:00
Nicolas Goaziou 633d66d7c4 org.texi: Fix a function name 2012-10-15 21:33:06 +02:00
Carsten Dominik 6fae77a8d6 Fix date prompt documentation
* doc/org.texi: Explain that date/time information at read-date prompt should
start at the beginning, not anywhere in the middle of a long string.
2012-10-15 08:38:54 +02:00
Eric Schulte 8ec79bff9a document prefix argument to org-babel-tangle
* doc/org.texi (Extracting source code): Mention the prefix argument to
  org-babel-tangle.
2012-10-08 20:28:25 -06:00
Bastien Guerry 1ef9eed3cf Merge branch 'maint' 2012-10-02 18:08:00 +02:00
Bastien Guerry 98bc46731a org.texi (Installation): Update the link to Org's ELPA
* org.texi (Installation): Update the link to Org's ELPA.
2012-10-02 18:07:50 +02:00
Bastien Guerry 4f0b3bfe0c Merge branch 'maint' 2012-10-02 13:07:09 +02:00
Bastien Guerry c7d6970864 Fix manuals: don't mention (require 'org-install) anymore.
* org.texi (Installation): Don't mention org-install.el
anymore as the replacement file org-loaddefs.el is now loaded
by org.el.

* orgguide.texi (Installation): Ditto.
2012-10-02 12:17:30 +02:00
Nicolas Goaziou 2a95a47c5f Merge branch 'maint' 2012-10-01 21:37:48 +02:00
Nicolas Goaziou fac86b03fe Normalize comma-escaping of src-blocks and example-blocks
* lisp/org-src.el (org-escape-code-in-string,
  org-unescape-code-in-string, org-escape-code-in-region,
  org-unescape-code-in-region): New functions.
(org-edit-src-code, org-edit-src-exit): Use new functions.
* lisp/org.el (org-strip-protective-commas): Removed function.
* lisp/org-exp.el (org-export-select-backend-specific-text): Use new
  function.
* lisp/ob.el (org-babel-parse-src-block-match,
  org-babel-parse-inline-src-block-match, org-babel-insert-result):
  Always escape produced blocks, independently on the language of the
  block, if any.  Use new functions.
* doc/org.texi: Update documentation.
* testing/lisp/test-ob.el: Update test.
2012-10-01 21:24:00 +02:00
Bastien Guerry d52e988c36 Merge branch 'maint' 2012-09-29 16:35:05 +02:00
Bastien Guerry ead43c9807 Point to the Org ELPA page for instructions on installing through ELPA
Also some minor rephrasing.
2012-09-29 16:34:33 +02:00
Bastien Guerry f155f5458e Merge branch 'maint' 2012-09-29 08:28:34 +02:00
Bastien Guerry 8e15063364 Small fixes to the guide and the manual
* org.texi (Installation, Feedback, Batch execution):
Use (add-to-list 'load-path ... t) for the contrib dir.

* orgguide.texi (Activation): No need to add org-mode to
auto-mode-alist since Emacs 22.2.
2012-09-29 07:27:51 +02:00
Bastien Guerry 132414b11c Merge branch 'maint' 2012-09-28 16:37:34 +02:00
Memnon Anon 213e2934c1 Add a link to documentation
* doc/org.texi (Tracking your habits): Point to the
  "Tracking TODO state changes" section.

As suggested by Jonas Stein.

TINYCHANGE
2012-09-28 15:51:56 +02:00
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
Achim Gratz 4ca67b8164 Merge branch 'maint' 2012-08-26 09:28:08 +02:00
Achim Gratz f8cc3189f5 Makefile: deactivate perl scripts unless server configuration is active
* doc/Makefile: Do not use perl scripts in util/ unless the server
  configuration $(SERVERMK) is set.
2012-08-26 09:25:34 +02:00
Bastien Guerry d09a6b3db5 Merge branch 'maint' 2012-08-25 10:29:09 +02:00
Bastien Guerry eaa1dee2d0 Fix version in README_DIST and doc/orgcard.tex 2012-08-25 10:28:59 +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
Bastien Guerry 7445ee7d04 org.texi: Small update.
* org.texi (Top, Introduction): Fix formatting.
(Activation): Add index entries.
(Conventions): Update section.
(Embedded @LaTeX{}): Fix formatting.

Mention that `C-c a' is assumed to be the keybinding for `org-capture'
in the whole manual.  Thanks to Vagn Johansen who triggered this.
2012-07-12 09:11:10 +02:00
Thomas S. Dye 69aa5ab26f Manual does not list :results output graphics as babel header arg
Aloha all,

The attached patch changes the link to the languages supported by babel
from a directory listing to the Worg page that uses a table to link to
the language-specific documentation pages.  It was suggested by John
Hendy.

All the best,
Tom
John Hendy <jw.hendy@gmail.com> writes:

> On Tue, Jul 10, 2012 at 10:19 AM, Thomas S. Dye <tsd@tsdye.com> wrote:
>> John Hendy <jw.hendy@gmail.com> writes:
>>
>>> On Mon, Jul 9, 2012 at 7:35 PM, Thomas S. Dye <tsd@tsdye.com> wrote:
>>>> John Hendy <jw.hendy@gmail.com> writes:
>>>>
>>>>> I have typically outputted graphics from R via tikzDevice manually,
>>>>> but gave my first whirl to just including things via the :file
>>>>> argument in my block header. In the process, I was trying to get this
>>>>> to work and found I needed to use:
>>>>>
>>>>> -----
>>>>> :results output graphics
>>>>> -----
>>>>>
>>>>> This is listed on Worg ob-R-doc:
>>>>> - http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-R.html#sec-4-3
>>>>>
>>>>> But I didn't originally know about it, as it's not a listed header
>>>>> argument in the manual, which is where I check since they're all
>>>>> listed in one place:
>>>>> - http://orgmode.org/manual/results.html#results
>>>>>
>>>>> Does the manual only list universal babel header arguments and R is in
>>>>> a subset of ones using =:results output graphics= or should it be
>>>>> there?
>>>>>
>>>>
>>>> Hi John,
>>>>
>>>> The babel header arguments are implemented at two levels.
>>>>
>>>> There are general babel arguments that apply to all the supported
>>>> languages.  These are described in the manual.
>>>>
>>>> It is also possible for the individual language implementations to
>>>> define their own header arguments.  R is a good example, where the very
>>>> many arguments to the various R output devices are built into ob-R.el.
>>>> These language specific header arguments are not described in the
>>>> manual, but instead appear in the language specific documentation on
>>>> Worg.
>>>>
>>>> Re: your specific question about :results output graphics.  I believe
>>>> this is an R specific header argument and that it is described in the
>>>> appropriate place in the documentation on Worg (see lines 68 and 230
>>>> of ob-R.el).
>>>>
>>>> The manual is not a one-stop source for answers to all Babel questions.
>>>> Recourse to the language specific documentation is typically necessary,
>>>> which is why it would be great if someone could find time to work up
>>>> documentation for the 20 or so languages that still lack it :)
>>>
>>> Thanks for the clarification and that answers the question. This was a
>>> specific header argument for R. Perhaps the manual could link to this
>>> page?
>>> - http://orgmode.org/worg/org-contrib/babel/languages.html
>>>
>>> Maybe with a diddy: "Some languages feature their own unique header
>>> arguments. The above document only universal, system wide Babel header
>>> arguments and one should consult the specific language page on Worg
>>> for additional features."
>>>
>>> Just a thought.
>>
>> Hi John,
>>
>> Thanks for this thought, which is indeed reasonable.  I thought the
>> manual might lack this structure, but when I went back to the
>> manual I found that
>> http://orgmode.org/manual/Specific-header-arguments.html#Specific-header-arguments
>> has this at the bottom of the page: "Additional header arguments are
>> defined on a language-specific basis, see Languages", where "Languages"
>> is a link to another manual page, one with a table of supported
>> languages and a link to the Worg page you cite.
>>
>
> Wow. You see only what you look for. :embarrassed:
>
>> The language is a bit different than your proposal, but the path seems
>> clear enough to me.
>
> Technically the path points to
> http://orgmode.org/worg/org-contrib/babel/languages/; I'd point it to
> http://orgmode.org/worg/org-contrib/babel/languages.html as it looks
> cleaner vs. just looking at the directory of .html files. Either
> way... the manual totally does it's job and I missed it!
>
> Thanks for bearing with me!
> John
>
>>
>> Of course, there is still the issue of the languages that lack
>> language-specific documentation :)
>>
>> All the best,
>> Tom
>>
>> --
>> T.S. Dye & Colleagues, Archaeologists
>> 735 Bishop St, Suite 315, Honolulu, HI 96813
>> Tel: 808-529-0866, Fax: 808-529-0884
>> http://www.tsdye.com

>From 0438f0ae1e23321dbacd0666119205985959433e Mon Sep 17 00:00:00 2001
From: Thomas Dye <tsd@tsdye.com>
Date: Tue, 10 Jul 2012 07:12:13 -1000
Subject: [PATCH] Changed babel languages link following a suggestion by John
 Hendy
2012-07-10 21:34:03 +02:00
Jan Böcker 436b5a0ee9 fix typo in org.texi
The attached patch fixes a typo in the documentation.
I hope I got the format of the commit message right.

Best regards,
   Jan

>From 7daa1f794794d515624ab28310db81a0e4099ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6cker?= <jan.boecker@jboecker.de>
Date: Sat, 16 Jun 2012 15:04:43 +0200
Subject: [PATCH] org.texi: fix typo

* doc/org.texi (The spreadsheet): fix typo
2012-07-06 10:35:58 +02:00
Bastien Guerry 6fb93276ea org.texi (Visibility cycling): Document `show-children'.
* org.texi (Visibility cycling): Document `show-children'.

Thanks to Gustav Wikström for a preliminary patch for this.
2012-07-06 10:27:33 +02:00
Achim Gratz 80d4f778c7 Re-normalize to "Org mode" in manual
* doc/org.texi: Re-normalize to "Org mode" in manual.
2012-06-04 08:41:01 +02:00
Achim Gratz 45b7bb4bdf Adapt documentation to new build system
* doc/org.texi (Installation): Adapt documentation to new build
system.  Mention GNU ELPA (since it needs to be handled like Emacs
built-in Org).
2012-06-04 08:41:01 +02:00
Bastien Guerry 9eabcb899b Revert "Fix small typo in org.texi."
This reverts commit 4144c55ec7.
2012-06-01 09:37:06 +02:00
Bastien Guerry 4144c55ec7 Fix small typo in org.texi. 2012-05-31 12:14:44 +02:00
Achim Gratz 0db8233460 replace the remaining occurences of sed with emacs scripts, implement mkdir with install
* UTILITIES/org-fixup.el (org-make-local-mk): New function to create a
  local.mk template from default.mk.

* UTILITIES/org-fixup.el (org-make-letterformat): New function to
  replace the format string for A4 with one for Letter.

* default.mk: Few cosmetic changes to the template section.  Add
  definition MAKE_LOCAL_MK for call to org-make-local-mk.  Remove
  definition for SED, which is not used anymore.  Implement MKDIR with
  'install -d' by default.  Since both CP and MKDIR are now
  implemented with install, this reduces the number of external
  dependencies.  Add mode settings to both invocations of install to
  keep the modes of installed files sane even if umask is set to a
  strange value.

* targets.mk: Remove sed script and use $(MAKE_LOCAL_MK) instead.

* doc/Makefile: Remove sed script and replace with emacs script.  This
  script can not be placed into a variable since it would expand $<
  and $@ in the context of the "card" target rather than the pattern
  rule.
2012-05-30 12:30:21 +02:00
Bastien Guerry f71d45a913 New option `org-capture-bookmark' (mentioned in the manual.)
* org.texi (Using capture): Mention the
`org-capture-last-stored' bookmark as a way to jump to the
last stored capture.

* org-capture.el (org-capture-bookmark): New option.
(org-capture-finalize): Use it.
2012-05-25 23:45:31 +02:00
Bastien Guerry 747d71675c Merge branch 'maint'
Conflicts:
	doc/org.texi
	doc/orgguide.texi
	lisp/org.el
2012-05-25 09:42:02 +02:00
Bastien Guerry 60587ea91c Bump to version 7.8.11. 2012-05-25 09:36:15 +02:00
Adam Spiers b57e23694f Fix typo in manual index's description of the 'Hooks' section
* doc/org.texi: Fix typo in description of the 'Hooks' section
2012-05-18 08:30:00 +02:00
Adam Spiers 677a94a961 Document ID special property.
* doc/org.texi: add ID to the list of special properties.
2012-05-18 08:29:57 +02:00
Achim Gratz a0a344bff1 inject version strings into orgguide
* doc/orgguide.texi: Include version strings from "org-version.inc".

* doc/Makefile: Make "org-version.inc" a dependency of "guide".
2012-05-18 07:45:46 +02:00
Achim Gratz b4693de937 clean up server targets in doc/Makefile and make sure they are working
* doc/Makefile: ignore errors from removing directory (may not exist),
  manual depends on 'org-version.inc'.
2012-05-18 07:45:46 +02:00
Achim Gratz bcced6a51d Makefile: avoid spurious recompilations of documentation
* doc/Makefile: org-version.inc is again dependent on org.texi.  This
  avoids recompilation when nothing has been changed; target "clean"
  still removes orgversion.texi to produce a consistent set of
  documentation and code after a "make clean" on toplevel

* targets.mk: add "doc" as prerequisite to "all" and "compile" to have
  it call "clean" in the doc subdir.
2012-05-18 07:45:45 +02:00
Bastien Guerry 9212ff07de Merge branch 'maint'
Conflicts:
	doc/org.texi
	lisp/org.el
2012-05-16 19:21:33 +02:00
Bastien Guerry 429e6aafa6 Bump to version 7.8.10. 2012-05-16 19:20:07 +02:00
Bastien Guerry cb23085ac2 Merge branch 'maint' 2012-05-16 19:08:48 +02:00
Bastien Guerry e6560f2528 Backport change in org.texi by Glenn Morris.
See http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=d38a0a
2012-05-16 19:08:29 +02:00
Bastien Guerry e70068feed org.texi (Uploading files): Fix typo.
* org.texi (Uploading files): Fix typo.

Thanks to François Pinard for spotting this.
2012-05-06 00:53:42 +02:00
Jason Dunsmore 6a38c1fac3 Fixed indentation in capture template doc. 2012-05-04 14:57:34 -05:00
Jason Dunsmore 67f9bbb7fa Clarified to capture template expansion doc. 2012-05-04 14:47:40 -05:00
Bastien Guerry 1c4ac932f3 Merge branch 'maint' 2012-05-01 18:43:41 +02:00
Bastien Guerry 9fa0b5e794 org.texi (Durations and time values): Fix typo.
* org.texi (Durations and time values): Fix typo.
2012-05-01 18:43:28 +02:00
Bastien Guerry d6e56bce71 org.texi: Document `C-0' as a prefix argument for `org-capture'.
* org.texi (Using capture): Document `C-0' as a prefix
argument for `org-capture'.

Thanks to Charles for this.
2012-04-29 10:58:36 +02:00
Brian van den Broek a178bc9d84 Small grammar tweaks in export sections of org.texi
* org.texi The sections in the Exporting section of the manual left
out articles in the description of the org-export-as-* commands, among
other places. This patch adds them, adds a few missing prepositions,
and switches instances of "an HTML" to "a html" for internal
consistency.

TINYCHANGE
2012-04-24 23:27:59 +02:00
Bastien Guerry 5add9cdef0 org-agenda.el: Implement `org-agenda-persistent-marks' for bulk actions.
* org-agenda.el (org-agenda-persistent-marks): New option to
keep marks after a bulk action.  The option defaults to nil.
(org-agenda-bulk-action): Use the new option.

* org.texi (Agenda commands): Document persistent marks.
2012-04-24 18:10:55 +02:00
Bastien Guerry 1666b910fe org-capture.el: Use %\n instead of %n.
* org-capture.el (org-capture-fill-template): Use %\n instead of %n as a
template element to be replaced with the nth prompted string.
(org-capture-templates): Update docstring.

* org.texi (Template expansion): Update doc to reflect change.

Using %n triggers errors when the template contains escaped strings,
which happens a lot with links.
2012-04-24 11:54:16 +02:00
Bastien Guerry e9d34dcd72 org.texi: Fix insertion of {} chars.
Thanks to Richard Stanton for spotting this.
2012-04-23 19:24:04 +02:00
Toby S. Cubitt b7982a0024 org-capture.el: Fixed bug in org-capture-templates %<n> expandos
* lisp/org-capture.el (org-capture-fill-template): Fixed regexp for
  %<n> expandos to match any positive integer.
  (org-capture-templates): Updated docstring accordingly.

* doc/org.texi: Updated documentation accordingly.
2012-04-23 17:34:15 +02:00
Bastien Guerry b1618e2d69 Fix missing } in org.texi. 2012-04-23 12:59:32 +02:00
Toby Cubitt e13d182ce8 Allow %<num> escapes to capture templates, expanded to text entered in <num>'th prompt
* org-capture.el (org-capture-fill-template): Expand %<num>
escape sequences into text entered for <num>'th %^{PROMPT} escape.
2012-04-23 12:48:40 +02:00
Bastien Guerry e9dec29bb1 org-table.el: Escape some special characters when sending radio tables.
* org-table.el (orgtbl-send-table): Escape special characters.
Introduce a new parameter :no-escape to prevent escaping.

* org.texi (Radio tables): Document the :no-escape parameter.

Thanks to Alexander Willand for raising this issue.
2012-04-23 00:09:35 +02:00
Achim Gratz 0a9c29d305 allow customization of the "doc" target to skip certain types of documentation
* doc/Makefile: read targets to make for "doc" from $(ORG_MAKE_DOC),
  defaults to "info html pdf"; can be overridden by the user in
  local.mk.

* targets.mk: read targets to make for "doc" and "docs" from
  $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by
  the user in local.mk.

* default.mk: document ORG_MAKE_DOC and provide a (commented) example
  of how to have make only produce info documentation.
2012-04-22 10:51:29 +02:00
Achim Gratz 22447fe485 fix typo
* doc/Makefile: fix typo, it is org-version.inc, not org-version.texi
2012-04-22 10:51:21 +02:00
Achim Gratz c5377f6034 always make version files
* doc/Makefile: make org-version.inc .PHONY so that it is always re-made.

* lisp/Makefile: make org-version.el .PHONY so that it is always re-made.
2012-04-21 17:38:43 +02:00
Andrew Hyatt 44e7ed1a59 Allow archiving to a datetree.
* org-archive.el (org-archive-subtree): Allow archiving to a
datetree.

* org.el (org-archive-location): Ditto.

* org.texi (Moving subtrees): Document the ability to archive
to a datetree.

TINYCHANGE
2012-04-21 17:37:48 +02:00
Achim Gratz f6c2848dfb * add missing dependencies on org-version.inc
* doc/Makefile: org-version.inc must be a dependency of "pdf" and "html"
2012-04-21 16:09:02 +02:00
Ippei FURUHASHI 32bd764573 org.texi: Fix typos of function names in Agenda commands
* org.texi (Agenda commands): Fix two typos by giving corresponding
function names, according to `org-agenda-view-mode-dispatch'.

TINYCHANGE
2012-04-21 12:13:25 +02:00
Bastien Guerry 08bd0b8892 Merge branch 'local-Makefile' into test-makefile-merge 2012-04-21 10:02:28 +02:00
Brian van den Broek 8f3dc945b2 Change example timestamps to not occur in headlines.
* org.texi: Alter several examples of headings with timestamps
in them to include the timestamps in the body instead of the heading.

* orgguide.texi: Alter the same examples in the same way as for
org.texi.

The Org-mode manual explicitly discourages the inclusion of timestamps
in headlines, yet examples do just that. These changes make the manual
consistent with its own advice.

TINYCHANGE
2012-04-21 00:43:24 +02:00
Feng Shu a9d3ce0bcd Allow to use imagemagick for previewing LaTeX fragements.
* org.el (org-latex-create-formula-image-program): New option
to use either dvipng or imagemagick to convert and preview
LaTeX fragments.
(org-preview-latex-fragment, org-format-latex): Handle the new
option.
(org-create-formula-image-with-dvipng): Rename from
`org-create-formula-image'.
(org-create-formula-image-with-imagemagick): New defun to
handle LaTeX preview with imagemagick.
(org-latex-color, org-latex-color-format): New defuns to
handle color conversions.

* org-latex.el (org-latex-to-pdf-process, org-export-as-pdf):
Allow to use imagemagick to convert LaTeX fragments.

* org-html.el (org-export-html-preprocess): Ditto.

* org-exp.el (org-export-with-LaTeX-fragments): Ditto.

* org.texi (@LaTeX{} fragments): Document imagemagick as an
alternative to dvipng.
2012-04-21 00:42:59 +02:00
Bastien Guerry ec921a2a68 Support hourly repeat cookies.
* org.el (org-repeat-re)
(org-clone-subtree-with-time-shift, org-auto-repeat-maybe)
(org-deadline, org-schedule, org-matcher-time)
(org-time-stamp, org-read-date, org-read-date-get-relative)
(org-display-custom-time, org-get-wdays)
(org-time-string-to-absolute, org-closest-date)
(org-timestamp-change): Allow to set hourly repeat cookie.
Send an error when an hourly repeat cookie is set and no hour
is specified in the timestamp.

* org.texi (Repeated tasks): Document repeat cookies for
years, months, weeks, days and hours.

* org-agenda.el (org-agenda-get-timestamps): Match hourly
repeat cookies.

* org-icalendar.el (org-print-icalendar-entries): Handle
hourly repeat cookies.

Thanks a lot to Takafumi Arakaki for this idea and for a preliminary
version of this patch.
2012-04-21 00:42:56 +02:00
Achim Gratz e102e411e4 doc/Makefile: rename/add auto-generated files to be compatible with Emacs
* doc/Makefile: rename auto-generated file "git-describe.texi" to
  "org-version.inc" to allow for easier inclusion into Emacs.

* doc/org.texi: include "org-version.inc" instead of
  "git-describe.texi".

* lisp/Makefile: new auto-generated file org-version.el with autoload
  cookies.  The version strings will be pulled during autoload
  extraction into org-install.el (standalone org-mode) or
  ../loaddefs.el (Emacs).
2012-04-20 21:04:14 +02:00
Achim Gratz 6a3ec67abd Introduce $(datadir), prefix all installation paths with $(DESTDIR)
Makefile: remove includes for maintainer targets, these will go
	into local.mk on the server

	default.mk: introduce $(datadir) to replace $(etcdir) in etc/Makefile

	doc/Makefile: replace $etcdir) with $(datadir)

	lisp/Makefile: record ODT styles location as defconst in org-install

	{doc,etc,lisp}/Makefile: prefix all installation targets with $(DESTDIR)
2012-04-20 21:04:11 +02:00
Achim Gratz 6da2d089b0 move all version strings into org-install.el
* targets.mk: check for release and git version and record this
	into environment variables for use in sub-make invocations; add
	new target "compile-dirty" that does not invoke "make clean" first
	* doc/Makefile, lisp/Makefile: remove git version check, since
	they are now provided by first-level make
	* lisp/Makefile: add insertion of version information into
	org-install.el, have org-install.el depend on LISPF rather than
	LISPC so that autoloads can be produced without compiling
	everything and remove insertion into org.el and re-compilation
	during install; add new target "compile-dirty" to support
	invocation from first-level make
	* lisp/org.el (org-version): remove determination of version
	information, show "N/A" if the information is not provided via
	org-install.el
2012-04-20 21:04:10 +02:00
Achim Gratz 306c748f63 inject git-describe version and date into org manual
* doc/Makefile: introduce target for git-describe.texi, which is an
	  automatically generated file that records the output of git-describe
	  and date; remove this file during make clean
	* doc/org.texi: remove @set for VERSION and DATE and do an @include
	  git-describe.texi instead
2012-04-20 21:04:09 +02:00
Achim Gratz 8bbf77a748 finish cleanup on infodir, some refinements on rules
* doc/Makefile: cleanall additionally removes the directories for
	manual and guide; fix the dir file in infodir after removal of org
	documentation

	* lisp/Makefile: remove debug statement
2012-04-20 21:04:08 +02:00
Achim Gratz 501f9b1741 use sed instead of perl, add target clean-install
* Makefile, lisp/Makefile, doc/Makefile: add target clean-install
	to remove files in install-directories

	* default.mk: add customization variable $(SED)

	* doc/Makefile: do not remove dir while cleaning

	* lisp/Makefile: use sed instead of perl to weave git-status into
	org.el and ignore any errors while doing it.  Keep git status in
	$(GITSTATUS) to make it more clear what happens in the check.
2012-04-20 21:04:08 +02:00
Achim Gratz a5cb04dcd8 hand off ./doc to sub-make
* Makefile: use info function for output and call shell only once
* default.mk: add PDFTEX and RMR variables for customization
* lisp/Makefile: add target 'all' and create $(lispdir) if necessary
* maint-targets.mk: invoke sub-make for HTML manuals
* maint.mk: remove unsused VARIABLES
* targets.mk: invoke sub-make for ./doc and clean up some targets
2012-04-20 21:04:07 +02:00
Bastien Guerry d1f1c586d5 Fix merge conflict. 2012-04-20 11:43:27 +02:00
Ippei FURUHASHI ec7052d1c7 org.texi: Fix typos of function names in Agenda commands
* org.texi (Agenda commands): Fix two typos by giving corresponding
function names, according to `org-agenda-view-mode-dispatch'.

TINYCHANGE
2012-04-20 11:30:13 +02:00
Max Mikhanosha 7212801808 Merged origin/master into max-sticky-agenda 2012-04-13 18:15:18 -04:00
Bastien Guerry ac2cb80ec0 orgcard.tex: Fix copyright year. 2012-04-11 13:01:23 +02:00
Bastien Guerry fd6b2a6b77 orgcard.tex: Fix copyright year. 2012-04-11 13:00:40 +02:00
Bastien Guerry fe5e004e39 Merge branch 'hotfix' 2012-04-11 12:30:55 +02:00
Bastien Guerry 148e8c7724 Bump to version 7.8.09. 2012-04-11 12:30:40 +02:00
Bastien Guerry 49645b6014 org.texi: State that you can use the d: option by specifying a list of drawers.
* org.texi (Export options): State that you can use the d:
option by specifying a list of drawers.

Thanks to François Pinard for requesting this.
2012-04-11 08:17:53 +02:00
Jambunathan K d6773457a2 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-04-10 22:30:11 +05:30
Jambunathan K e1c83760bc doc/org.texi: Fix compilation error 2012-04-10 22:24:54 +05:30
Bastien Guerry e8912e1bd8 Merge branch 'hotfix' 2012-04-10 14:33:01 +02:00
Jérémie Courrèges-Anglas 1e12cbdeda Deadlines and scheduling: Fix order in DEADLINE example
* doc/org.texi (Deadlines and scheduling): Fix the example: the DEADLINE
item should come right after the headline.

TINYCHANGE
2012-04-10 14:32:52 +02:00
Bastien Guerry 00f59ff30b Merge branch 'hotfix' 2012-04-09 12:35:15 +02:00
Julian Gehring 2d8913f1fc org.texi: Fix missing links and formatting in 'Exporting' section 2012-04-09 12:35:06 +02:00
Bastien Guerry 4899b81483 Merge branch 'hotfix' 2012-04-05 08:51:51 +02:00
Ippei FURUHASHI 4e35c21c09 doc/org.texi: Fix two typos in Agenda commands
doc/org.texi: Fix two typos in Agenda commands

* doc/org.texi (Agenda commands): Fix typos by swapping
the equivalent keybindings to `org-agenda-next-line'
with the ones to `org-agenda-previous-line'.

TINYCHANGE
2012-04-05 08:51:41 +02:00
Bastien Guerry 3b04635542 Small doc improvement about HTML pre/postamble.
* org-html.el (org-export-html-preamble-format)
(org-export-html-postamble-format): Improve the docstring.

* org.texi (HTML preamble and postamble): Small doc improvement.

Thanks to Zachary Jones who asked for this.
2012-04-02 23:28:52 +02:00
Bastien Guerry c187c512af Merge branch 'hotfix-7.8.06' 2012-04-02 17:58:01 +02:00
Bastien Guerry 60b6f60dfe Bump to version number 7.8.08. 2012-04-02 17:57:49 +02:00
Bastien Guerry 5651adb133 Merge branch 'hotfix-7.8.06' 2012-04-02 07:52:09 +02:00
Bastien Guerry ccd84a9f63 Fix spelling mistakes.
Thanks to Paul Eggert for spotting these.
2012-04-02 07:51:52 +02:00
Bastien Guerry 33e5cdd358 org.texi: Fix copyright year. 2012-04-01 22:05:49 +02:00
Eric Schulte 1193844018 documentation for the new file-desc header argument 2012-03-31 14:49:21 -04:00
Bastien Guerry 61106491b3 Merge branch 'hotfix-7.8.06' 2012-03-31 11:25:28 +02:00
Bastien Guerry a3ca0e43e5 Update version to 7.8.07 from hotfix. 2012-03-31 11:24:57 +02:00
Bastien Guerry 3c57eb297b doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:59 +02:00
Bastien Guerry d1ed590320 doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
Thanks to David Niemi for the fix.
2012-03-26 22:37:29 +02:00
Jambunathan K e2f490826c Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 02:51:09 +05:30
Jambunathan K aa20053803 org.texi (Customizing tables in ODT export): Fix errors
* doc/org.texi (Customizing tables in ODT export): Correct few
errors.
2012-03-21 02:47:55 +05:30
Jambunathan K acec9db838 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-21 02:15:24 +05:30
Jambunathan K 1cc2af2f25 org.texi: Udpate ODT section
* doc/org.texi (Links in ODT export): Update.
(Labels and captions in ODT export): New node.
2012-03-21 02:13:55 +05:30
Jambunathan K b137bc4eae Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-20 20:31:04 +05:30
Jambunathan K f2fc168a73 org.texi (Literal examples in ODT export): Update
* doc/org.texi (Literal examples in ODT export):
htmlfontify.el in Emacs-24.1 now supports fontification.  So
ODT source blocks will be fontified by default.

(Evaluating code blocks, Evaluating code blocks):
Whitespace-only change.
2012-03-20 20:23:47 +05:30
Bastien Guerry 05ca3731f2 Merge branch 'hotfix-7.8.06' 2012-03-20 12:37:37 +01:00
Rustom Mody 4ef3304ac2 doc/org.texi: Small doc fix.
TINYCHANGE
2012-03-20 12:31:26 +01:00
Bastien Guerry cc46c9627b Merge branch 'hotfix-7.8.06' 2012-03-20 12:26:16 +01:00
Julian Gehring 04c9e0e64c doc/org.texi: Remove duplicated keybinding for 'org-refile-cache-clear'.
* org.texi (Refiling notes): Remove duplicated keybinding.

TINYCHANGE
2012-03-20 12:25:51 +01:00
Julian Gehring e2444eab93 doc/org.texi: Tiny stylistic improvements.
TINYCHANGE
2012-03-20 12:23:05 +01:00
Bastien Guerry 00365ede15 Bump to version 7.8.06. 2012-03-19 22:23:16 +01:00
Bastien Guerry ecd0562c5f Fix the master branch.
I started from the 78ec8e commit then cherry-picked and squashed
commits that have been done in master since then, except the bad
commits that overwrote the tree (in master) with the tree in maint.

This commit also bumps the version number to 7.8.06.

The only "fix" that was made between 78ec8e and the previous commit
is e0072f which has been reported to break stuff.
2012-03-19 22:01:29 +01:00
Bastien Guerry 73cbeabe1b Merge branch 'maint' 2012-03-18 12:12:09 +01:00
Bastien Guerry 095e578676 Update to 7.8.05 2012-03-17 16:43:26 +01:00
Bastien Guerry 218e8e444a Update version 7.8.05 2012-03-17 16:41:44 +01:00
Bastien Guerry 560624fcc7 Set version 7.8.04 in maint. 2012-03-17 16:32:53 +01:00
Bastien Guerry de42649f7b Manually revert maint to e85080.
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00