Achim Gratz
37e1a11b9e
ob-R: declare ess-current-process-name
...
* lisp/ob-R.el: Forward declare `ess-current-process-name'.
2014-09-19 12:03:43 +02:00
Achim Gratz
c478b57d4e
Merge branch 'maint'
2014-09-19 11:53:46 +02:00
Achim Gratz
98afe0046f
ob-sh: compatibility fix for "Marker does not point anywhere" errors in Emacs 23
...
* lisp/ob-sh.el (org-babel-sh-initiate-session): After initiating a
session, initialize the marker `comint-last-output-start' since it
is going to be used by the ANSI color filter without further checks
in Emacs 23 and throws an error.
2014-09-19 11:52:30 +02:00
Achim Gratz
7d8523d9d1
ob-shell: compatibility fix for "Marker does not point anywhere" errors in Emacs 23
...
* lisp/ob-shell.el (org-babel-sh-initiate-session): After initiating a
session, initialize the marker `comint-last-output-start' since it
is going to be used by the ANSI color filter without further checks
in Emacs 23 and throws an error.
2014-09-19 11:34:09 +02:00
Achim Gratz
1aa719cff2
ox-texinfo: fix bug in 3432681fbe
...
* lisp/ox-texinfo.el: Add missing argument to call of
`org-element-property'.
2014-09-19 10:39:02 +02:00
Achim Gratz
1483df8c99
org-table: for compatibility, use org-file-equal-p
...
* lisp/org-table.el: Predicate function `file-equal-p' is not
available in older Emacsen, use compatibility function
`org-file-equal-p' instead.
2014-09-19 10:05:15 +02:00
Nicolas Goaziou
dd70cf773c
Merge branch 'master' of orgmode.org:org-mode
2014-09-18 22:09:40 +02:00
Nicolas Goaziou
80e493a1f7
Merge branch 'maint'
...
Conflicts:
lisp/ox-html.el
2014-09-18 22:08:30 +02:00
Achim Gratz
e5f61642a3
ob-R: make it work with older ESS versions
...
* lisp/ob-R.el (org-babel-R-initiate-session): The PROC argument is
mandatory for older ESS versions.
2014-09-18 21:56:53 +02:00
Nicolas Goaziou
873fe49811
ox-html: Fix linking to deep level headlines
...
* lisp/ox-html.el (org-html-headline): Make sure even listified
headlines have proper anchors so internal links can refer to them.
Small refactoring.
Thanks to Bruce Gilstrap for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90835
2014-09-18 21:37:07 +02:00
chasberry
0fd29a5ee7
lisp/ob-R.el: use `ess-wait-for-process' to assure clean session startup
...
* lisp/ob-R.el (org-babel-R-initiate-session): Make sure that (R) has
finished before `rename-buffer' is run.
TINYCHANGE
2014-09-17 21:10:40 -04:00
Nicolas Goaziou
3432681fbe
Parsing and exporting special blocks preserve case
...
* lisp/org-element.el (org-element-special-block-parser):
* lisp/ox-latex.el (org-latex-special-block):
* lisp/ox-html.el (org-html-special-block):
* lisp/ox-man.el (org-man-special-block):
* lisp/ox-odt.el (org-odt-special-block):
* lisp/ox-texinfo.el (org-texinfo-special-block):
* contrib/lisp/ox-groff.el (org-groff-special-block): Preserve case.
* testing/lisp/test-org-element.el (test-org-element/special-block-parser):
Add test.
2014-09-17 20:52:54 +02:00
Nicolas Goaziou
b2fca73e30
Tiny refactoring
...
* lisp/org.el (org-hide-block-toggle-maybe): Tiny refactoring.
2014-09-16 09:30:29 +02:00
Nicolas Goaziou
c8a7e474ec
Fix `org-hide-block-toggle' return value
...
* lisp/org.el (org-hide-block-toggle-maybe): Do not return a non-nil
value when toggling failed.
(org-hide-block-toggle): Update docstring.
* testing/lisp/test-org.el (test-org/hide-block-toggle-maybe): New
test.
2014-09-16 09:29:28 +02:00
Nicolas Goaziou
2afd5fbb09
Fix `org-hide-block-toggle-maybe'
...
* lisp/org.el (org-hide-block-toggle-maybe): Never throw an error.
Improve docstring.
(org-hide-block-toggle): Improve docstring.
2014-09-15 20:21:20 +02:00
Nicolas Goaziou
9ba9f916e8
Fix `org-up-heading-safe'
...
* lisp/org.el (org-up-heading-safe): Do not throw any error, as
advertised in the docstring.
2014-09-15 18:49:19 +02:00
Nicolas Goaziou
a927894d12
ob-gnuplot: Fix error when table contains dates
...
* lisp/ob-gnuplot.el (org-babel-gnuplot-table-to-data): Dynamically
bind `org-babel-gnuplot-timestamp-fmt' instead of making it
buffer-local, since export takes place in another buffer anyway.
Thanks to Thomas Holst for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90709
2014-09-15 13:47:20 +02:00
Nicolas Goaziou
3aa27acfcb
Fix "Not at a block" error on dynamic blocks
...
* lisp/org.el (org-hide-block-toggle, org-indent-block): Recognize
dynamic blocks.
Thanks to Eric S Fraga for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90711
2014-09-15 13:32:50 +02:00
Bastien Guerry
e17ee8e577
Merge branch 'master' of orgmode.org:org-mode
2014-09-14 11:02:51 +02:00
Michael Brand
739136e17f
Table formula: Fix for Lisp return value nil
...
* lisp/org-table.el (org-table-eval-formula): Substitute `listp' with
`consp'.
* testing/lisp/test-org-table.el (test-org-table/lisp-return-value):
Fix test.
2014-09-14 10:44:28 +02:00
Michael Brand
551891e2ad
Table formula: Add ERT for Lisp return values
...
* testing/lisp/test-org-table.el (test-org-table/lisp-return-value):
Add test with TODO.
2014-09-14 10:43:37 +02:00
Nicolas Goaziou
3f88821f01
org-element: Fix outdated comment
2014-09-13 22:34:15 +02:00
Nicolas Goaziou
97ae50fab3
org-element: Fix planning parsing
...
* lisp/org-element.el (org-element-planning-parser): Remove useless
check.
(org-element--next-mode): Change signature.
(org-element--parse-elements, org-element--parse-to): Apply signature
change.
* testing/lisp/test-org-element.el (test-org-element/planning-parser):
Add test.
2014-09-13 22:31:06 +02:00
Bastien Guerry
e6074ec4d7
Merge branch 'master' of orgmode.org:org-mode
2014-09-13 15:52:17 +02:00
Nicolas Goaziou
9209aa3c9d
org-table: Use "ox.el" internally for radio tables
...
* lisp/org-table.el (org-table-clean-before-export, orgtbl-get-fmt,
orgtbl-apply-fmt, orgtbl-eval-str, orgtbl-format-line,
orgtbl-format-section): Remove functions.
(org-table-clean-did-remove-column, *orgtbl-table*, *orgtbl-rtn*,
*orgtbl-hline*, *orgtbl-sep*, *orgtbl-default-fmt*, *orgtbl-fmt*,
*orgtbl-efmt*, *orgtbl-lfmt*, *orgtbl-llfmt*, *orgtbl-lstart*,
*orgtbl-llstart*, *orgtbl-lend*, *orgtbl-llend*): Remove variables.
(org-table-export, orgtbl-send-table): Apply function removal. Do not
set `org-table-last-alignment' and `org-table-last-column-widths'
anymore.
(org-table-to-lisp, orgtbl-send-replace-tbl): Small refactoring.
(org-table--to-generic-table, org-table--to-generic-row,
org-table--to-generic-cell): New functions.
(orgtbl-to-generic): Rewrite function. Handle :skip and :skipcols
parameters.
(orgtbl-to-latex, orgtbl-to-html, orgtbl-to-texinfo, orgtbl-to-orgtbl,
orgtbl-to-unicode): Use new `orgtbl-to-generic' features.
* testing/lisp/test-org-table.el (test-org-table/to-generic,
test-org-table/to-latex, test-org-table/to-texinfo,
test-org-table/to-html, test-org-table/to-unicode,
test-org-table/send-region): New tests.
* doc/org.texi (Radio tables, A @LaTeX{} example, Translator
functions): Update documentation.
* etc/ORG-NEWS (argument): Document new features.
2014-09-13 15:10:26 +02:00
Nicolas Goaziou
66b1263d9a
ox-latex: Tweak table row export
...
* lisp/ox-latex.el (org-latex-table-row): Rewrite code to distinguish
between regular rows and separators.
2014-09-13 00:13:46 +02:00
Bastien Guerry
2bd8370d06
Merge branch 'master' of orgmode.org:org-mode
2014-09-12 21:40:17 +02:00
Nicolas Goaziou
70a0c5bfa1
Fix "Not at a block" error on export blocks
...
* lisp/org.el (org-hide-block-toggle): Fix "Not at a block" error on
export blocks.
2014-09-12 20:58:47 +02:00
Bastien Guerry
fdd9d878e0
Merge branch 'master' of orgmode.org:org-mode
2014-09-12 19:02:50 +02:00
Nicolas Goaziou
4cb0bc089f
Fix "Not at a block" error on special blocks
...
* lisp/org.el (org-hide-block-toggle): Fix "Not at a block" error on
special blocks.
Thanks to Fabrice Popineau for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90663
2014-09-12 18:40:49 +02:00
Bastien Guerry
8b416bf96b
Merge branch 'master' of orgmode.org:org-mode
2014-09-12 14:14:03 +02:00
Nicolas Goaziou
6eb9827d53
org-element: Fix cache error on empty drawers
...
* lisp/org-element.el (org-element--cache-for-removal): Handle case
when greater element is totally empty.
Thanks to Malcolm Purvis for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90639
2014-09-11 23:19:22 +02:00
Nicolas Goaziou
3d45b4285b
Merge branch 'maint'
2014-09-11 18:27:22 +02:00
Nicolas Goaziou
01f736b763
org-src: Fix idle auto-save feature
...
* lisp/org-src.el (org-edit-src-code): Fix regexp.
(org-edit-src-exit): Do not remove auto-save timer. This is
handled by the timer itself.
`org-edit-src-save' calls `org-edit-src-exit', which then clears the
auto-save timer, thus preventing any further auto-saves before the
next `org-edit-src-code' call.
Thanks to Adriaan Sticker for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90650
2014-09-11 18:21:41 +02:00
Bastien Guerry
a11e884723
Merge branch 'master' of orgmode.org:org-mode
2014-09-10 11:45:20 +02:00
Achim Gratz
ec8f245d27
ob-eval: Do not use read-only mode, switch to compilation mode only once
...
* lisp/ob-eval.el (org-babel-eval): Switch to compilation mode only if
the current mode is not already (a derived mode of)
compilation-mode. Remove the read-only state from the buffer
directly without using `read-only-mode'.
2014-09-10 11:22:43 +02:00
Achim Gratz
2f8067c915
Merge branch 'maint'
2014-09-10 10:51:02 +02:00
Achim Gratz
d4a7ba2a96
mk/org-fixup.el: Do not use toggle-read-only
...
* mk/org-fixup.el (org-make-org-version, org-make-org-loaddefs,
org-make-local-mk, org-make-letterformat): Do not use
`toggle-read-only' as it has been obsoleted in 24.4 and the
replacement read-only-mode should not be used from Lisp in most
cases. Bind `inhibit-read-only' to t instead.
2014-09-10 10:50:05 +02:00
Bastien Guerry
7520cf33d9
Merge branch 'master' of orgmode.org:org-mode
2014-09-08 15:00:00 +02:00
Nicolas Goaziou
b5c9de618e
Merge branch 'maint'
2014-09-08 12:10:28 +02:00
Nicolas Goaziou
7c48bdd7a8
Revert "ox: Implement predicate for export blocks"
...
This reverts commit 2160b3d242
.
2014-09-08 12:09:52 +02:00
Nicolas Goaziou
d4281e5f3f
Revert "ORG-NEWS: Document `export-block' type removal"
...
This reverts commit 98b719fb59
.
Conflicts:
etc/ORG-NEWS
2014-09-08 12:01:35 +02:00
Nicolas Goaziou
e3369c07f0
Revert "Merge export and special blocks within back-ends"
...
This reverts commit fbc7097ffa
.
Conflicts:
lisp/ox-texinfo.el
2014-09-08 11:57:27 +02:00
Bastien Guerry
59d2f28024
Merge branch 'master' of orgmode.org:org-mode
2014-09-07 00:44:33 +02:00
Nicolas Goaziou
1a7c9d7d79
ox-html: Fix 9a34a1
...
* lisp/ox-html.el (org-html-paragraph): Only apply special rule in
list items.
Thanks to Richard Lawrence for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90532
2014-09-06 19:03:18 +02:00
Bastien Guerry
41eae9bd42
Merge branch 'master' of orgmode.org:org-mode
2014-09-06 10:47:11 +02:00
Nicolas Goaziou
c235bd83d2
ox: Implement body filter
...
* lisp/ox.el (org-export-filters-alist): Add body filter.
(org-export-filter-body-functions): New variable.
(org-export-as): Call body filter.
* doc/org.texi (Advanced configuration):
* etc/ORG-NEWS (argument): Document new filter.
2014-09-06 10:28:38 +02:00
Bastien Guerry
0ba1b1ad6d
Merge branch 'master' of orgmode.org:org-mode
2014-09-05 03:06:12 +02:00
Nicolas Goaziou
1f3c6c2f49
Merge branch 'maint'
2014-09-04 22:15:04 +02:00
Nicolas Goaziou
4b9146cd68
org.texi: Tiny fix
2014-09-04 22:14:23 +02:00