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
c7be54d3cb
Merge branch 'hotfix-7.8.06'
2012-03-20 16:25:44 +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
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
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
309bd4c263
Merge branch 'hotfix-7.8.06'
2012-03-20 13:15:44 +01:00
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
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
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
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
6c911234ac
Remove files coming from maint.
2012-03-20 01:50:59 +01:00
Bastien Guerry
df82832fb7
Merge maint fixup and finish master fixup
2012-03-20 00:35:55 +01:00
Bastien Guerry
4e5c24ea81
Delete files that sneaked in while fixing the master branch.
2012-03-19 23:48:07 +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
6bcba14919
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:37:52 +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