02ab072061
Merge branch 'maint'
2013-11-13 08:46:26 +01:00
757eb6e0fb
Fix previous commits
...
Thanks to Jambunathan for pointing this.
2013-11-13 08:46:01 +01:00
cdaeac1aa0
Merge branch 'maint'
2013-11-13 07:40:56 +01:00
369f70ac28
ox-odt.el: Add version and package-version to some options
...
* ox-odt.el (org-odt-inline-formula-rules)
(org-odt-inline-image-rules, org-odt-use-date-fields): Add
version and package-version.
2013-11-13 07:35:57 +01:00
d2ba43c496
ox-html.el: Add version and package-version to some options
...
* ox-html.el (org-html-format-drawer-function)
(org-html-format-headline-function)
(org-html-format-inlinetask-function)
(org-html-creator-string): Add version and package-version.
Thanks to Jambunathan for reporting problems in this area.
2013-11-13 07:27:10 +01:00
b6522af499
Merge branch 'maint'
2013-11-12 21:24:57 +01:00
4d7293e2d0
ox-html.el (org-html-text-markup-alist): Fix version
...
* ox-html.el (org-html-text-markup-alist): Fix version.
Thanks to Jambunathan for reporting this.
2013-11-12 21:24:32 +01:00
f505fa20b4
Merge branch 'maint'
2013-11-12 21:12:42 +01:00
f49654aeff
org-agenda.el (org-agenda-set-restriction-lock): Autoload
...
* org-agenda.el (org-agenda-set-restriction-lock): Autoload.
2013-11-12 21:12:28 +01:00
487057fc26
Fix conflicts from previous merge
2013-11-12 21:11:23 +01:00
71884cc039
Merge branch 'maint'
...
Conflicts:
lisp/ob-C.el
lisp/ob-clojure.el
lisp/ob-core.el
lisp/ob-lisp.el
lisp/org-clock.el
2013-11-12 21:00:49 +01:00
f95641c443
Backport changes from Emacs revs 115081 and 115082
...
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 20:57:31 +01:00
e4984e2783
fix tangle bug, checking empty headlines commented
...
Thanks to Michael Brand for catching this bug.
* lisp/ob-tangle.el (org-babel-under-commented-heading-p): robust to
empty headlines.
2013-11-11 13:54:21 -07:00
7ca6817495
Merge branch 'maint'
2013-11-11 18:14:24 +01:00
6a577a2b5a
org.el (org-deadline, org-schedule): Fix bug
...
* org.el (org-deadline, org-schedule): Fix bug: allow to
update scheduled/deadline information anywhere in the subtree.
2013-11-11 18:14:11 +01:00
e156163aec
Merge branch 'master' of orgmode.org:org-mode
2013-11-11 18:03:38 +01:00
51638aed3e
change wording of processing message
...
* lisp/ob-exp.el (org-babel-exp-src-block): Tweak wording of
processing message.
2013-11-11 09:33:05 -07:00
cd35ad9314
Improve "Processing Org code block" message
...
* ob-exp.el (org-babel-exp-src-block): Improve message by adding line number.
2013-11-11 09:32:09 -07:00
086d502c91
org.el (org-todo): Tiny docstring enhancement
...
* org.el (org-todo): Tiny docstring enhancement.
2013-11-11 17:01:21 +01:00
8393c461d4
Merge branch 'maint'
2013-11-11 16:59:43 +01:00
60db8b535b
README_maintainer: Fix erroneous statement
...
* README_maintainer: Fix erroneous statement.
2013-11-11 16:59:19 +01:00
f101663489
org-element: Interpret pseudo elements and objects
...
* lisp/org-element.el (org-element-interpret-data): Change signature.
One can now define pseudo elements and objects types.
(org-element--interpret-data-1): New function.
* testing/lisp/test-org-element.el: Add tests.
* testing/lisp/test-ox.el: Update tests.
A pseudo element or object is a new element or object type that is
created and treated locally within an export back-end. The back-end
provides a translator for it and it is ignored when interpreted back
into Org syntax.
2013-11-11 13:16:43 +01:00
e3033d35c9
Merge branch 'maint'
2013-11-11 10:11:42 +01:00
fb239ceb7a
ox-texinfo: Fix incorrect @documentencoding
...
* lisp/ox-texinfo.el (org-texinfo-supported-coding-systems): New
variable.
(org-texinfo-template): Find appropriate encoding among those
supported.
Reported-by: Suvayu Ali <fatkasuvayu+linux@gmail.com>
2013-11-11 10:09:21 +01:00
a59ef0e499
Merge branch 'maint'
2013-11-11 01:56:15 +01:00
6cc028bf74
ox: Fix next/previous element getters
...
* lisp/ox.el (org-export-get-previous-element,
org-export-get-next-element): Fix return value for non plain text
objects in a secondary string.
* testing/lisp/test-ox.el: Add tests.
2013-11-11 01:54:01 +01:00
c57372d5fa
Merge branch 'maint'
...
Conflicts:
testing/lisp/test-org-element.el
2013-11-10 11:47:06 +01:00
ede82ccf93
org-element: Fix infloops
...
* lisp/org-element.el (org-element-center-block-parser)
(org-element-drawer-parser, org-element-dynamic-block-parser)
(org-element-footnote-definition-parser)
(org-element-inlinetask-parser, org-element-property-drawer-parser)
(org-element-quote-block-parser, org-element-comment-block-parser)
(org-element-diary-sexp-parser, org-element-example-block-parser)
(org-element-keyword-parser, org-element-latex-environment-parser)
(org-element-paragraph-parser, org-element-src-block-parser)
(org-element-table-parser, org-element-verse-block-parser): Fix
infloop when buffer ends with a non-empty blank line after the
element.
* testing/lisp/test-org-element.el: Add tests.
2013-11-10 11:28:14 +01:00
ca100eaa01
Merge branch 'maint'
2013-11-10 10:25:17 +01:00
84818415e8
org-element: Fix infloop
...
* lisp/org-element.el (org-element-comment-parser): Fix infloop when
a non-empty blank line follows a comment at the end of the buffer.
* testing/lisp/test-org-element.el: Add test.
2013-11-10 10:23:18 +01:00
eca45d5728
updated README in contrib-directory for org-index.el
2013-11-09 20:23:36 +01:00
d94c53b440
Merge branch 'maint'
2013-11-09 17:48:44 +01:00
132994911b
org.el (org-align-tags-here): Fix bug: move to the correct position
...
* org.el (org-align-tags-here): Fix bug: move to the correct
position.
Thanks to Reuben Garrett for reporting this bug.
2013-11-09 17:47:59 +01:00
f31eb421d6
Small change to org-index.el to reflect the new location of org-index.el
2013-11-08 20:53:38 +01:00
71152dd691
Merge branch 'maint'
2013-11-08 08:56:39 +01:00
b21c5fa272
ox-latex: Remove all temporary files when compiling
...
* lisp/ox-latex.el (org-latex-compile): Remove all numbered temporary
files after compiling.
2013-11-08 08:54:52 +01:00
2b25b5d978
test-org-table: Replace hline lhs expression in table formula
...
* testing/lisp/test-org-table.el: Replace hline lhs expression in table
formula with relative row expression.
This fixes a test fail introduced by a2c71a6e35
2013-11-07 20:29:02 +01:00
0656278de4
Merge branch 'maint'
2013-11-06 19:17:39 +01:00
92f89eedba
ox-org: Fix headline level during subtree export
...
* lisp/org-element.el (org-element-headline-interpreter): Take into
consideration `org-odd-levels-only' when building a headline.
* lisp/ox-org.el (org-org-headline): Correctly set transcoded headline
level during subtree export.
2013-11-06 19:14:14 +01:00
7ffc460c7f
Merge branch 'maint'
2013-11-06 16:52:49 +01:00
4c04c13a18
org-inlinetask: Hide inline tasks in 'children visibility state
...
* lisp/org.el (org-cycle-hide-inline-tasks): Re-hide inline tasks when
switching to 'children visibility state.
TINYCHANGE
2013-11-06 16:51:56 +01:00
41755e24ed
Merge branch 'maint'
2013-11-06 16:26:49 +01:00
47b0eec8dc
org-capture.el (org-capture-refile): Don't finalize prematurely
...
* org-capture.el (org-capture-refile): Don't finalize
prematurely.
Thanks to Rodrigo Amestica for reporting this.
2013-11-06 16:26:38 +01:00
39d22406e4
Merge branch 'maint'
2013-11-06 16:16:07 +01:00
fe3379bda6
org.el (org-agenda-prepare-buffers): Restore the point position
...
* org.el (org-agenda-prepare-buffers): Restore the point
position.
Thanks to Samuel Wales for spotting this.
2013-11-06 16:15:45 +01:00
ed38714b14
Merge branch 'maint'
2013-11-06 16:12:57 +01:00
4c94c4d062
ox-html: Add TODO keyword to TOC entries
...
* lisp/ox-html.el (org-html--format-toc-headline): TOC entries are
closer to regular headline formatting.
2013-11-06 16:12:24 +01:00
17eda87a39
Merge branch 'maint'
2013-11-06 15:52:15 +01:00
747f46aa1f
org-capture: Fix bug when capturing with templates using `function'
...
* org-capture.el (org-capture): Store :return-to-wconf
earlier.
(org-capture-place-template): Don't store :return-to-wconf
when called from a capture template using `function', rely on
the early :return-to-wconf value store from `org-capture'.
Thanks to Brett Viren for raising this issue.
2013-11-06 15:51:57 +01:00
990339ea23
Merge branch 'maint'
2013-11-06 10:02:18 +01:00
Bastien Guerry
Eric Schulte
Sebastien Vauban
Nicolas Goaziou
Marc-Oliver Ihm
Achim Gratz
Jonas Hoersch