Commit Graph

6186 Commits

Author SHA1 Message Date
Jambunathan K 135a74e4cb Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-20 23:53:46 +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 1d0fa25bda Merge branch 'hotfix-7.8.06' 2012-03-20 17:21:57 +01:00
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 d22ffc23d0 Merge branch 'master' of orgmode.org:org-mode 2012-03-20 16:29:31 +01:00
Henning Weiss c6442dac9c org-mobile.el (org-mobile-sumo-agenda-command): Use a shorter title.
* org-mobile.el (org-mobile-sumo-agenda-command): Use a
shorter title.

TINYCHANGE
2012-03-20 16:28:45 +01:00
Bastien Guerry d1fd77819e org-mobile.el: Whitespace cleanup. 2012-03-20 16:25:39 +01:00
Jambunathan K b137bc4eae Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-03-20 20:31:04 +05:30
Bastien Guerry b8cd4a0973 Merge branch 'hotfix-7.8.06' 2012-03-20 15:50:46 +01:00
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 2cc3fd7b0d org.el: Don't declare function `format-spec' as it is already required. 2012-03-20 13:14:34 +01:00
Bastien Guerry 44bf4de900 Merge branch 'hotfix-7.8.06'
Conflicts:
	lisp/org-agenda.el
2012-03-20 13:06:26 +01:00
Bastien Guerry fc717f3eb7 Fix compiler warnings. 2012-03-20 13:04:55 +01:00
Bastien Guerry b05e7cdf3b org-html.el: New option `org-export-html-date-format-string'.
* org-html.el (org-export-html-date-format-string): Make a
defcustom.

TINYCHANGE

Thanks to Sébastian Vauban for this patch.
2012-03-20 12:12:35 +01:00
Bastien Guerry a0554234ef * org-html.el (org-export-as-html): New option: a format string
for the HTML export of date and time.
2012-03-20 12:11:25 +01:00
Bastien Guerry c8f9972a41 org-latex.el: Fix TeX-master declaration.
* org-latex.el (org-export-as-latex): Fix TeX-master declaration.

TINYCHANGE
2012-03-20 12:11:25 +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
Bastien Guerry fcc7aa5cc9 Merge branch 'hotfix-7.8.06' 2012-03-20 11:50:55 +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 98b8cdd333 Merge branch 'hotfix-7.8.06' 2012-03-20 11:12:04 +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 fffd14fc3a Merge branch 'hotfix-7.8.06'
Conflicts:
	lisp/org-exp-blocks.el
2012-03-20 11:07:00 +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
Carsten Dominik c7a26931f0 Merge branch 'fix-ts-regexp0' 2012-03-20 06:53:20 +01:00
Carsten Dominik 7d84b300f4 Allow date stamps to have no dame of day, in one more place
* lisp/org.el (org-ts-regexp0): Allow time stamps without name of day.
2012-03-20 06:52:53 +01:00
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
Bastien Guerry 3982ce5f6c Merge branch 'hotfix-7.8.06' 2012-03-20 03:03:43 +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 34a9780378 Merge branch 'hotfix-7.8.06' 2012-03-20 02:58:01 +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
Bastien Guerry 57e677d444 Merge branch 'hotfix-7.8.06' 2012-03-20 02:54:14 +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
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 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 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 b32d2f737d org-exp: Add japanese translation
* org-exp.el (org-export-language-setup): Add japanese translation.

Translation by Hideki SAITO
<CAAaRP5umR8kDfZoZw6y2XJgyL70YdiJqLtpBvX++0ff+mU=fhA@mail.gmail.com>,
converted to numeric character entities.

TINYCHANGE
2012-03-18 19:55:01 +01:00
David Maus dab84afa75 Numeric character entities for proper rendering of non-UTF8 documents
* org-exp.el (org-export-language-setup): Use numeric character
entities for proper rendering of non-UTF8 documents.
2012-03-18 19:39:18 +01:00
tumashu b2913c9227 org-exp: Add simplified chinese translation
* org-exp.el (org-export-language-setup): Add simplified
chinese translation.

TINYCHANGE
2012-03-18 18:55:41 +01:00
David Maus 05847efd4a Merge branch 'maint' 2012-03-18 18:45:43 +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 73cbeabe1b Merge branch 'maint' 2012-03-18 12:12:09 +01:00
Bastien Guerry cdd9e2b91a Remove "Version" tag in org-eshell.el 2012-03-17 16:43:48 +01:00