1a42967061
Merge branch 'origin-maint'
2012-03-09 06:54:36 -07:00
26e817ac20
The link generated by org-store-link is escaped twice when tangling with ":comments yes" flag.
...
* ob-tangle.el (org-babel-spec-to-string): The link generated by
org-store-link is escaped twice when tangling with ":comments yes"
flag.
2012-03-09 06:54:22 -07:00
9cf435800b
org-html.el (org-export-as-html): Remove another useless space before tag.
...
* org-html.el (org-export-as-html): Remove another useless
space before tag.
Thanks to Mathias Bauer for spotting this.
2012-03-09 03:09:15 +01:00
d0570f9592
org-html.el (org-export-as-html): Remove another useless space before tag.
...
* org-html.el (org-export-as-html): Remove another useless
space before tag.
Thanks to Mathias Bauer for spotting this.
2012-03-09 03:08:43 +01:00
e77daf8391
Merge branch 'maint'
2012-03-09 02:55:03 +01:00
1b4480e15f
org-html.el (org-export-as-html): Remove useless space before tag.
...
* org-html.el (org-export-as-html): Remove useless space
before tag.
Thanks to Mathias Bauer for spotting this.
2012-03-09 02:54:34 +01:00
f8efc63236
Add autoload instruction before org-version
...
* org.el (org-version): Add autoload cookie.
TINYCHANGE
2012-03-08 14:22:42 +01:00
dfa317b6f3
Merge branch 'maint'
2012-03-08 14:08:38 +01:00
e78cb895ca
org.el (org-get-category): Save match data.
...
* org.el (org-get-category): Save match data.
Thanks to Adam Spiers for spotting this issue.
2012-03-08 14:08:15 +01:00
b879590f3b
Merge branch 'maint'
2012-03-08 13:50:51 +01:00
11e441e85f
Fix typos
2012-03-08 13:50:19 +01:00
e896ca6707
Add example demonstrating LaTeX_CLASS_OPTIONS
...
* org.texi (Header and sectioning): Add example demonstrating how to use
"LaTeX_CLASS_OPTIONS".
TINY CHANGE
2012-03-08 13:44:49 +01:00
c889f209fb
Merge branch 'master' of orgmode.org:org-mode
2012-03-08 09:50:34 +01:00
94fe07a5f5
org-e-html: Improve handling of images, headlines and inlinetasks
...
1. Handle inlining of remote images
2. Proper handling of "alt" attribute for regular imgages and dvipnged
fragments.
3. Support for Inlinetasks
4. Headlines are "transcoded" in three places:
- org-e-html-headline (`org-e-html-format-headline')
- org-e-html-inlinetask
- org-e-html-toc (`org-e-html-format-toc-headline')
These are now conveniently wrapped and cleared through
'org-e-html-format-headline--wrap'. The regular and toc headlines
formatters mentioned afore take a superset of arguments allowed by
`org-e-html-format-headline-function'. Augmenting the signature of
the `org-e-html-format-headline-function' is worth considering.
2012-03-08 13:28:44 +05:30
f9d864435d
Merge branch 'master' of orgmode.org:org-mode
2012-03-07 18:24:21 +01:00
62a631e236
org-export: Small fix
...
* contrib/lisp/org-export.el (org-export-get-ordinal): Change signature.
* EXPERIMENTAL/org-e-ascii.el (org-e-ascii--build-caption): Apply
changes to previous function
2012-03-07 18:02:57 +01:00
bbbdff9f81
org-export: Predicate in `org-export-get-ordinal' accepts two arguments
...
* contrib/lisp/org-export.el (org-export-get-ordinal): Predicate in
`org-export-get-ordinal' accepts two arguments.
2012-03-07 17:18:20 +01:00
0f799373b2
Merge branch 'master' of orgmode.org:org-mode
2012-03-07 09:05:44 +01:00
d2bcc61001
org-e-html: Support for enumerating inline images
2012-03-06 23:31:59 +05:30
32947c0eed
Merge branch 'master' of orgmode.org:org-mode
2012-03-06 09:40:22 +01:00
dad33a6b3d
Merge branch 'origin-maint'
2012-03-05 14:55:05 -07:00
9371465aab
describe the ability to execute noweb references in the manual
...
* doc/org.texi (Noweb reference syntax): Describe the ability to
execute noweb references in the manual.
2012-03-05 14:54:56 -07:00
40bd216119
Merge branches 'maint' and 'master' of orgmode.org:org-mode
2012-03-05 21:10:22 +01:00
0630d89a0c
Merge branch 'maint' of orgmode.org:org-mode
2012-03-05 21:10:22 +01:00
93ad1e4c9a
Merge branch 'origin-maint'
2012-03-05 10:46:01 -07:00
9480a2210c
improved sbe documentation
2012-03-05 10:45:25 -07:00
f6ea7c581c
Merge branch 'origin-maint'
2012-03-05 08:22:55 -07:00
efe039db93
fix two bugs related to calling tangle with a prefix argument
...
* lisp/ob-tangle.el (org-babel-tangle): Don't prompt for a file name
if :tangle is specified.
* lisp/ob.el (org-babel-expand-noweb-references): Widen buffer when
expanding noweb references.
2012-03-05 08:22:35 -07:00
2cff2cb159
Merge branch 'origin-maint'
2012-03-05 07:32:19 -07:00
aceddafc06
fixed bug in `sbe' when variables are force interpreted as strings
...
* lisp/ob-table.el (sbe): Don't accidentally leave a `t' value when
variables are force interpreted as strings.
2012-03-05 07:32:03 -07:00
dfeac71699
Merge branch 'master' of orgmode.org:org-mode
2012-03-04 20:57:19 +01:00
21c7ad67cf
Merge branch 'maint'
...
org-bbdb in master already contained declare-function for external
bbdb-functions.
Conflicts:
lisp/org-bbdb.el
2012-03-04 20:53:05 +01:00
a49193da37
org-e-odt: Bring it to the same level as org-e-html
2012-03-05 01:22:20 +05:30
c9482d61a8
org-bbdb: Pass variable to avoid dynamic scoping.
...
* org-bbdb.el (org-bbdb-open, org-bbdb-open-old)
(org-bbdb-open-new): Pass record name to avoid dynamic scoping.
2012-03-04 20:37:46 +01:00
595769d359
org-bbdb: Declare functions, silence byte compiler
...
* org-bbdb.el (bbdb-record-get-field, bbdb-search-name)
(bbdb-search-organization): Declare functions to silence byte
compiler.
2012-03-04 20:35:04 +01:00
4a6e02c722
Fix task cloning for repeating tasks
...
* org.el (org-clone-subtree-with-time-shift): Fix task cloning for
repeating tasks using .+n and ++n syntax
Tasks with repeaters using .+n and ++n syntax retain the repeater in
all of the clones causing duplicate tasks. These tasks are now
handled the same as the regular repeating task using +n syntax.
2012-03-04 20:20:25 +01:00
1749db14fb
org-agenda: Handle case of heading w/ date but no keyword
...
* lisp/org-agenda.el (org-agenda-highlight-todo): Handle the case of a
heading that has a date but no todo keyword.
This is a fix for the args-out-of-range bug discussed in these threads:
http://thread.gmane.org/gmane.emacs.orgmode/52621
http://thread.gmane.org/gmane.emacs.orgmode/52793
http://thread.gmane.org/gmane.emacs.orgmode/52786
http://thread.gmane.org/gmane.emacs.orgmode/52810
The discussions involved Ilya Shlyakhter, James Atwood, Nick Dokos,
and myself, and the subject headers are:
bug report: agenda timeline crashes
Bug report: weekly agenda and blank, timestamped headers
org-agenda-list (from git) giving "args-out-of-range error"
TINYCHANGE
2012-03-04 20:13:05 +01:00
a6dad43395
org-e-html: Support for cross references
2012-03-05 00:34:46 +05:30
dbe69f26aa
Merge branch 'maint'
2012-03-04 16:40:43 +01:00
b549c60065
test-org-footnote: Fix a broken test (part 2)
...
* testing/lisp/test-org-footnote.el: Fix
`test-org-footnote/normalize-outside-org'.
2012-03-04 16:39:43 +01:00
1b06c10e2c
Merge branch 'maint'
2012-03-04 15:55:41 +01:00
f1a99ceddf
test-org-footnote: Fix a broken test
...
* testing/lisp/test-org-footnote.el: Fix failing
`test-org-footnote/normalize-outside-org'.
2012-03-04 15:53:55 +01:00
f18ea108aa
test-org-export: Fix broken test
...
* testing/lisp/test-org-export.el (test-org-export/export-scope): In
batch mode, `transient-mark-mode' must be turned on.
2012-03-04 14:38:57 +01:00
bf609d8844
org-export: Avoid duplicates in `org-export-collect-footnote-definitions'
...
* contrib/lisp/org-element.el (org-element-map): New optional argument
to avoid recursion into certain recursive types.
* contrib/lisp/org-export.el (org-export-footnote-first-reference-p,
org-export-get-footnote-number,
org-export-collect-footnote-definitions): Use new argument from
`org-element-map'.
* testing/lisp/test-org-export.el: Add test.
The new argument allows to force entering footnotes definitions at
a certain time (when their first reference is found) but not a second
time when they are encountered in the parse tree.
Thanks to Jambunathan for reporting this.
2012-03-04 11:57:16 +01:00
6fd14fe683
adding a test to protect the "results don't replace code block" functionality
2012-03-03 07:45:20 -07:00
9915dc8905
fix code block replacement with results
...
* lisp/ob.el (org-babel-find-named-result): Fix code block replacement
with results.
2012-03-03 07:45:20 -07:00
951a6f2506
fix code block replacement with results
...
* lisp/ob.el (org-babel-find-named-result): Fix code block replacement
with results.
2012-03-03 07:35:31 -07:00
6dab0cd71f
Merge branch 'maint'
2012-03-03 13:08:35 +01:00
155ab73f77
org-footnote: Small fix to previous commit
...
* lisp/org-footnote.el (org-footnote-normalize): Do not normalize
labels when sort-only is non-nil.
2012-03-03 13:07:59 +01:00
daa687411d
Merge branch 'maint'
2012-03-03 13:01:59 +01:00
Eric Schulte
Deech
Bastien Guerry
Sebastien Vauban
Adam Spiers
Suvayu Ali
Jambunathan K
Nicolas Goaziou
David Maus
Bernt Hansen
Karl Fogel