Commit Graph

1579 Commits

Author SHA1 Message Date
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