Commit Graph

9957 Commits

Author SHA1 Message Date
Bastien Guerry 8dc05ad5f4 org-colview.el: Also consider inline tasks when computing the sum.
* org-colview.el (org-columns-compute): Also consider inline
tasks when computing the sum.

TINYCHANGE

Thanks to Myles English for spotting this and for his patch,
this one is a slightly modified version of his.
2012-03-23 22:04:36 +01:00
Thomas Morgan fe7d69bdea org-habit.el: Fix alignment of consistency graph in filtered agenda view.
* org-habit.el (org-habit-insert-consistency-graphs): Fix
alignment of consistency graph in filtered agenda view.

TINYCHANGE
2012-03-23 14:06:45 +01:00
Bastien Guerry 88d6292893 org-latex.el: Fix bug in setting the export directory according to the LaTeX options.
* org-latex.el (org-export-as-latex): Fix bug in setting the
export directory according to the LaTeX options.

Thanks to A. Major for reporting this and to Christian Moe for suggesting a
fix.
2012-03-23 13:55:50 +01:00
K.Nagashima 5bb4aabac7 org.el (org-show-subtree): Make interactive.
* org.el (org-show-subtree): Make interactive.

TINYCHANGE
2012-03-23 13:45:03 +01:00
Ilya Shlyakhter 532a1ac40a Tags/properties matcher: Fixed issues with todo-only matches
lisp/org.el (org-scan-tags): Require todo-only argument, and document
that it should be the same one set by make-org-tags-matcher.
Fix documentation to explain that todo-only is really
not-done-todo-only.

(org-make-tags-matcher): If todo part of matcher starts with /!,
matcher now always checks that the TODO keyword is present and
is a not-done state.  This matters e.g. for org-map-entries
which unlike org-scan-tags does not do its own separate todo-only
filtering.  Added docs to explain matcher dependencies.

(org-map-entries): Make sure todo-only is correctly passed from
org-make-tags-matcher to org-scan-tags.

* lisp/org-clock.el: (org-clock-get-table-data): Make sure todo-only
does not leak when it is set by make-org-tags-macher.

* lisp/org-crypt.el: (org-encrypt-entries, org-decrypt-entries): Make
sure todo-only is correctly passed from org-make-tags-matcher to
org-scan-tags.

* contrib/lisp/contacts.el: (org-contacts-filter) : Make sure todo-only
is correctly passed from org-make-tags-matcher to org-scan-tags.
2012-03-23 13:42:06 +01:00
Bastien Guerry 6ba1d35f64 Don't try to hide drawers within subtrees, it slows cycling down.
* org.el (org-cycle-internal-local): Don't try to hide drawers
within subtrees in this function, it slows cycling down.

This comments the change made in commit
bb28480169

Thanks to Marcel Van der Boom for reporting this.
2012-03-22 01:39:51 +01:00
Bastien Guerry 2fa0aa69ea org-agenda.el: Fix incorrect custom option definition.
* org-agenda.el (org-agenda-custom-commands-local-options):
Fix incorrect custom option definition.

Thanks to Joe Vornehm Jr. for this patch.
See http://patchwork.newartisans.com/patch/1231/
2012-03-22 01:19:03 +01:00
Bastien Guerry 652e5e0ecf Bugfix: use the date as the value for the ITEM column when displaying a summary.
* org-colview.el (org-columns-display-here): Bugfix: use the date as the
value for the ITEM column when displaying a summary.

Thanks to Rasmus Rempling for reporting this and to Nick Dokos for digging
further.
2012-03-21 23:57:29 +01:00
Bastien Guerry 5f7d9bffd7 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-21 23:50:37 +01:00
Martyn Jago 51c5680aa0 Re-direct homepage to Worg.
* lisp/ob-lilypond.el:
 Re-direct homepage to Worg.
2012-03-21 15:24:33 +01:00
Martyn Jago 988f742ccf Leave versioning to Org.
* lisp/ob-lilypond.el:
 Leave versioning to Org.

* testing/lisp/test-ob-lilypond.el:
 Leave versioning to Org.
2012-03-21 15:24:30 +01:00
Martyn Jago d1aa517381 Fix compiler warning.
* lisp/ob-lilypond.el: Fix compiler warning.
2012-03-21 15:24:27 +01:00
Jambunathan K 34ab9a0eb2 org-odt.el: Enumerate labeled/captioned entities correctly
* lisp/org-odt.el (org-odt-format-entity-caption): Enumerate
entities that have either a caption or a label.
(org-odt-label-styles, org-odt-category-map-alist): Add a
separator between sequence number and caption.  Introduced two
new label styles for handling of math formula and math label.
(org-odt-format-label-definition)
(org-export-odt-format-formula): Propagate above changes.
2012-03-21 15:21:10 +05:30
Bastien Guerry d83284b728 org.el (org-enforce-todo-dependencies): Fix docstring.
* org.el (org-enforce-todo-dependencies): Fix docstring.

Thanks to Bernt Hansen for spotting this.
2012-03-21 08:27:17 +01:00
Bastien Guerry 431407cc27 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-21 01:12:08 +01:00
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 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 fee7de7c56 org-odt.el: Make category component of captions configurable
* lisp/org-odt.el (org-export-odt-category-strings): New
custom variable.
(org-odt-category-map-alist): Modify interpretation.  Don't
use the same field to double up as both a OpenDocument
variable and a category string.  Entries in this list now
specify only the OpenDocument variable.  Category strings are
obtained through an indirect lookup of
`org-export-odt-category-strings'.  Use same OpenDocument
variables as what LibreOffice uses for various entities.  Fix
docstring.
(org-odt-add-label-definition)
(org-odt-format-label-definition)
(org-odt-format-label-reference): Propagate above changes.

Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg00628.html
2012-03-20 23:26:12 +05:30
Bastien Guerry 3007ddd1cc org-latex.el (org-export-as-latex): Check TeX-master correctly.
* org-latex.el (org-export-as-latex): Check TeX-master correctly.

TINYCHANGE
2012-03-20 17:21:42 +01:00
Jambunathan K aa05c14fe9 org-odt.el: Remove stale code
* lisp/org-odt.el (org-odt-category-map-alist): Update
docstring.
(org-export-odt-user-categories)
(org-export-odt-get-category-from-label)
(org-odt-get-label-category-and-style): Remove.
(org-odt-add-label-definition): Propagate above changes.
2012-03-20 21:11:21 +05:30
Bastien Guerry d1fd77819e org-mobile.el: Whitespace cleanup. 2012-03-20 16:25:39 +01:00
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 c73f32c14a org.el: Don't allow creation of parents when using refile as goto.
* org.el (org-refile): Don't allow creation of parents when
using the refile command to go to a headline.

TINYCHANGE
2012-03-20 15:44:44 +01:00
Jambunathan K d3cd3720d5 org-odt.el: Resolve headline links as sec nos only if num:t
* lisp/org-odt.el (org-odt-format-org-link): Resolve links to
headlines as section numbers only if section numbering is on.
2012-03-20 19:58:40 +05:30
Bastien Guerry 1987412be6 org.el (format-spec): Require 'format-spec.
* org.el (format-spec): Require 'format-spec.
2012-03-20 13:15:27 +01:00
Bastien Guerry fc717f3eb7 Fix compiler warnings. 2012-03-20 13:04:55 +01:00
Rustom Mody 4ef3304ac2 doc/org.texi: Small doc fix.
TINYCHANGE
2012-03-20 12:31:26 +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
Bastien Guerry 18ba67bf57 org-latex.el: Fix TeX-master declaration.
* org-latex.el (org-export-as-latex): Fix TeX-master declaration.

TINYCHANGE
2012-03-20 12:01:25 +01:00
Ilya Shlyakhter ca41982ad4 imenu: Added a check that looking-at succeeds before using the match results.
* lisp/org.el (org-imenu-get-tree): Check that looking-at succeeds before using match results.

TINYCHANGE
2012-03-20 11:50:42 +01:00
Bastien Guerry 9c8cc41ae1 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06 2012-03-20 11:11:40 +01:00
Bastien Guerry 042950a892 org-exp-blocks.el: Make a defcustom.
* org-exp-blocks.el (org-ditaa-jar-path): Make a defcustom.
2012-03-20 09:51:53 +01:00
Jambunathan K 4120d6fcf7 org-odt.el: Render links to outline headings as section nos
* lisp/org-lparse.el (org-do-lparse): Make effective setting
of `org-export-headline-levels' available to the ODT exporter.
Also remove some stale comments.

* lisp/org-odt.el (org-odt-format-link): Add support for
generating cross-references to chapter numbers.
(org-odt-format-org-link): Resolve links to outline headings
as section numbers.  This special case resolution kicks in
only if the Org link has no description and the target outline
is not listified i.e., it is at a level within
`org-export-headline-levels'.

Fix for the following request:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg01035.html

The above change is in conformity with the way links to
headlines will be treated in new ODT exporter that will be
built on top of Nicolas' org-element/org-export
infrastructure.
2012-03-20 13:32:23 +05:30
Jambunathan K c983bc2400 Fix ODT validation failures with French and other languages
* lisp/org-odt.el (org-odt-begin-toc): Handle named HTML
entities in per-language string for "Table Of Contents".

Fix for the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2011-07/msg00486.html
2012-03-20 13:02:02 +05:30
Bastien Guerry da24a0131f org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict.
* org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict.
2012-03-20 03:18:50 +01:00
Shaun Johnson ba249353d3 org-exp-blocks.el: Better heuristic to find the libary name.
* org-exp-blocks.el (org-ditaa-jar-path): Better heuristic
to find the libary name.

TINYCHANGE
2012-03-20 03:12:40 +01:00
Suvayu Ali 526cac1776 Change let bind to a let* in org-edit-src-code
* org-src.el (org-edit-src-code): Change let bind to let*,
          e.g. if case-fold-search is bound to nil globally, the
          (case-fold-search t) doesn't work until we get to the body.

	  The fix and analysis was provided by Nick Dokos on this
          email message thread:
          <http://thread.gmane.org/gmane.emacs.orgmode/53335/focus=53342>

	  TINY CHANGE
2012-03-20 03:03:32 +01:00
Bastien Guerry 2b3ae5c046 org-latex.el: Allow to use sidewaystable.
* org-latex.el (org-export-latex-tables): Allow to use
sidewaystable.

TINYCHANGE
2012-03-20 02:57:02 +01:00
Eric Schulte 9e30393125 fix bug in src name regexp when using *org-babel-use-quick-and-dirty-noweb-expansion*
* lisp/ob.el (org-babel-expand-noweb-references): Fix bug in src name
  regexp when using *org-babel-use-quick-and-dirty-noweb-expansion*.
2012-03-20 02:40:36 +01:00
David Maus 4480ebe5f5 UTILITIES/pw: Fix type in error message
* pw (action_update_patch): Fix type in error message.
2012-03-20 02:39:33 +01:00
Bastien Guerry be2e3039a1 Fix Makefile.
There was two problems: fixrelease merged the wrong way (merging
master into maint) and cleanrel tried to clean up files that were
already deleted.
2012-03-19 22:38:45 +01:00
Bastien Guerry 00365ede15 Bump to version 7.8.06. 2012-03-19 22:23:16 +01:00
Bastien Guerry 0496bd3190 Revert "Require one or more spaces (+) between keyword and headline"
This reverts commit e0072f7913.
2012-03-19 22:21:10 +01:00
Bastien Guerry c44e07a4fa Fix the maint branch.
Thanks to Achim Gratz for his precious help on this.
2012-03-19 20:27:28 +01:00
David Maus e0072f7913 Require one or more spaces (+) between keyword and headline
* org.el (org-scan-tags): Require one or more spaces (+) between
keyword and headline.

Otherwise the re will match a line like:

* TODO@ Foobar

And assumes the @ to be part of the headline.

This fixes a glitch reported by Simon Thum in
<4F53DEF7.8080604@gmx.de>.

> Hi all,
>
> I have found some irritating behaviour, potentially a bug. I have a
> block agenda which goes like:
>
> tags-todo "@home&TODO=\"TODO\"
>
> and it displays a certain org line that reads
>
> **** TODO_ state triggers
>
> Which is just a heading for dealing with TODO state triggers, and I
> appended the _ as I don't want it to be a TODO.
>
> For example, the global TODO list and syntax highlighting does not
> consider it a todo, but C-c a m TODO="TODO" does. TODO="T" does not,
> so it's not very grave.
>
> Most likely, it's simply an inconsistency arising from not having a
> real parser. I just wanted to report it here so it may get fixed.
2012-03-18 18:38:50 +01:00
David Maus cd2d138883 Don't reset `org-done-keywords-for-agenda' when org-agenda-multi
* org-agenda.el (org-prepare-agenda): Don't reset
`org-done-keywords-for-agenda' when org-agenda-multi.

Fixes a bug with DONE keywords in org-todo face reported by Hans-Peter
Deifel in <87r4xwypxh.fsf@hpdeifel.de>.
2012-03-18 17:58:12 +01:00
Bastien Guerry 54ead894de Remove "Version" tag in ob-fortran.el and org-eshell.el. 2012-03-17 16:42:25 +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 6e306f65ff Fix copyright years in maint. 2012-03-17 16:31:04 +01:00