ecf3a4af2c
Backport remaining changes from commit 7e09ef0
...
Add changes from Emacs repo that should have been backported with
bb77dd2
2015-08-10 02:17:19 -04:00
f70439f190
ob-clojure.el: Fix compatibility issue
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Fix compatibility
issue with cider >0.7.0.
2014-10-27 15:26:47 +01:00
39963a61d4
ob-clojure: Silence byte-compiler
2014-10-13 22:05:12 +02:00
942eb607e6
ob-clojure.el: Fix compatibility issue
...
* ob-clojure.el (org-babel-execute:clojure): Fix compatibility
issue with cider >0.7.0. This breaks compatibility with Cider
<=0.7.0.
Thanks to Daniel Szmulewicz for the suggested fix.
2014-10-06 15:47:40 +02:00
e81b911c46
ob-clojure.el: Remove nrepl.el support
...
* ob-clojure.el (org-babel-clojure-backend)
(org-babel-execute:clojure): Remove nrepl.el support.
2014-10-06 11:56:04 +02:00
3a9bbb0ec3
ob-clojure.el: fix behavior for :results pp
...
* lisp/ob-clojure.el (org-babel-expand-body:clojure): Simplify the
pretty printing.
(org-babel-execute:clojure): Check for "pp" in the parameters.
http://permalink.gmane.org/gmane.emacs.orgmode/84876
2014-04-14 12:28:02 +02:00
11f8efcda1
ob-clojure.el: revert cl-case back to case
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Revert cl-case back
to case.
2014-04-10 12:51:31 +02:00
645384a037
ob-clojure: adapt to new cider
...
* lisp/ob-clojure.el (org-babel-expand-body:clojure): Don't handle
output here, since the result becomes double quoted with current
cider. Move to `org-babel-execute:clojure' instead.
(org-babel-execute:clojure): Use `nrepl-send-string-sync' instead
of `cider-eval-sync', which was removed.
2014-04-10 10:30:23 +02:00
ebceff5412
ob-clojure.el: Don't use `cider-current-ns' to set the current namespace
...
* ob-clojure.el (org-babel-execute:clojure): Don't use
`cider-current-ns' to set the current namespace.
Thanks to Volker Strobel for reporting this issue.
2014-03-03 13:53:50 +01:00
a391d528e0
ob-clojure.el: Fix compiler warnings
2014-01-31 09:39:34 +01:00
de087d0bbe
ob-clojure.el (org-babel-execute:clojure): Fix output
...
* ob-clojure.el (org-babel-execute:clojure): Use
`org-babel-result-cond' to create the correct output.
Thanks to Soapy Smith who reported this and to Eric Schulte for providing the fix.
2014-01-30 12:10:37 +01:00
f8e1745440
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-07 14:19:03 +01:00
7d9a883b50
Update copyright years again.
...
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
c41f5075ac
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-05 06:36:11 +01:00
0beda99171
Revert "Update copyright years."
...
This reverts commit 21105594fc
2014-01-05 06:28:07 +01:00
096ff7e078
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-04 18:58:12 +01:00
21105594fc
Update copyright years.
2014-01-04 18:56:11 +01:00
581db4e0a5
ob-clojure.el (org-babel-clojure-backend): Use 'cider when available
...
* ob-clojure.el (org-babel-clojure-backend): Use 'cider as the
backend when available. Fall back on nrepl when available and
on slime otherwise.
2014-01-03 09:33:30 +01:00
059dc08dec
ob-clojure.el (org-babel-execute:clojure): Don't pretty print results
...
* ob-clojure.el (org-babel-execute:clojure): Don't pretty
print results.
Thanks to Daniel Szmulewicz for reporting this.
2013-12-14 14:26:56 +01:00
54a64f50b5
ob-C, ob-clojure, ob-tangle, org-agenda, org, ox: fix byte-compiler warnings
...
* lisp/ob-C.el, lisp/ob-clojure.e: Require 'cl at compile-time.
* lisp/ob-tangle.el: Do not require 'cl at compile time.
* lisp/org-agenda.el: Declare function `org-columns-remove-overlays´.
* lisp/org.el: Declare functions `org-clocktable-shift´,
`org-clock-update-time-maybe´, `org-clock-remove-overlays´,
`org-babel-tangle-file´, `org-table-blank-field´,
`org-table-insert-row´, `org-add-archive-files´, `org-table-begin´,
`org-table-end´. Move defsubst `org-uniquify´ before its many uses.
* lisp/ox.el: Move defsubst `org-export-get-parent´ before its many
uses.
2013-11-15 20:18:58 +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
dbc39fcef5
ob-clojure.el: Add support for the cider backend
...
* ob-clojure.el (org-babel-clojure-backend): Add customization
options.
(org-babel-execute:clojure): Add support for cider.
2013-11-04 11:30:34 +01:00
ee6c792ec7
ob-clojure nrepl customization variable
...
- ensure body is expanded for n-repl as well
- declare n-repl functions
- remove require ob-tangle from ob-clojure
* lisp/ob-clojure.el (org-babel-clojure-backend): Customization
variable to select clojure backend
(nrepl-eval): Declared function.
(nrepl-current-connection-buffer): Declared function.
(org-babel-execute:clojure): Execution now uses customized backend.
2013-10-03 13:25:46 -06:00
7429ceaa0c
ob-clojure.el: switch to nREPL as the main method of evaluating Clojure.
...
Get the old behavior with:
(defalias 'org-babel-execute:clojure 'org-babel--execute-clojure-slime)
2013-10-03 13:06:28 -06:00
5fc740a230
Merge branch 'maint'
2013-01-08 15:04:40 +01:00
72bc144c15
Update Copyright lines to match Emacs format.
2013-01-08 15:04:32 +01:00
60b23bdeac
Merge branch 'maint'
...
Conflicts:
contrib/lisp/htmlize.el
etc/schema/od-manifest-schema-v1.2-os.rnc
etc/schema/od-schema-v1.2-os.rnc
lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
98cd4687a2
Update copyright years.
...
Happy new year!
2013-01-01 16:04:24 +01:00
78cdf14939
org-babel-result-cond - unified handling of results
...
* lisp/ob.el (org-babel-result-cond): This function should now be used
by all language backends to handle the processing of raw code block
output into scalar results, table results, or ignored results
depending on the value of result-params.
* lisp/ob-C.el (org-babel-C-execute): Use org-babel-result-cond.
* lisp/ob-R.el (org-babel-R-evaluate-external-process): Use
org-babel-result-cond.
(org-babel-R-evaluate-session): Use org-babel-result-cond.
* lisp/ob-awk.el (org-babel-execute:awk): Use org-babel-result-cond.
* lisp/ob-clojure.el (org-babel-execute:clojure): Use
org-babel-result-cond.
* lisp/ob-emacs-lisp.el (org-babel-execute:emacs-lisp): Use
org-babel-result-cond.
* lisp/ob-fortran.el (org-babel-execute:fortran): Use
org-babel-result-cond.
* lisp/ob-io.el (org-babel-io-evaluate): Use org-babel-result-cond.
* lisp/ob-java.el (org-babel-execute:java): Use org-babel-result-cond.
* lisp/ob-lisp.el (org-babel-execute:lisp): Use org-babel-result-cond.
* lisp/ob-maxima.el (org-babel-execute:maxima): Use
org-babel-result-cond.
* lisp/ob-picolisp.el (org-babel-execute:picolisp): Use
org-babel-result-cond.
* lisp/ob-python.el (org-babel-python-evaluate-external-process): Use
org-babel-result-cond.
(org-babel-python-evaluate-session): Use org-babel-result-cond.
* lisp/ob-scala.el (org-babel-scala-evaluate): Use org-babel-result-cond.
* lisp/ob-sh.el (org-babel-sh-evaluate): Use org-babel-result-cond.
* lisp/ob-shen.el (org-babel-execute:shen): Use org-babel-result-cond.
* lisp/ob-sql.el (org-babel-execute:sql): Use org-babel-result-cond.
* lisp/ob-sqlite.el (org-babel-execute:sqlite): Use
org-babel-result-cond.
2012-11-18 21:58:38 -07:00
5e4cffbb06
code-block languages may specify their own headers and values
...
* lisp/ob-R.el (org-babel-header-args:R): Adding values.
* lisp/ob-clojure.el (org-babel-header-args:clojure): Adding values.
* lisp/ob-lisp.el (org-babel-header-args:lisp): Adding values.
* lisp/ob-sql.el (org-babel-header-args:sql): Adding values.
* lisp/ob-sqlite.el (org-babel-header-args:sqlite): Adding values.
* lisp/ob.el (org-babel-combine-header-arg-lists): Combine lists of
arguments and values.
(org-babel-insert-header-arg): Use new combined header argument
lists.
(org-babel-header-arg-expand): Add support for completing-read
insertion of header arguments after ":"
(org-babel-enter-header-arg-w-completion): Completing read insertion
of header arguments
(org-tab-first-hook): Adding header argument completion.
(org-babel-params-from-properties): Combining header argument lists.
* testing/lisp/test-ob.el (ob-test/org-babel-combine-header-arg-lists):
Test the new header argument combination functionality.
2012-04-13 08:43:16 -04:00
b93ed753ff
Merge branch 'origin-maint'
2012-01-13 13:09:34 -07:00
a370bae5d9
removed dependency on deprecated swank-clojure
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Removed dependency
on deprecated swank-clojure.
2012-01-13 13:07:54 -07:00
e44d2975ff
Fix copyright (to 2012) year and Org version (to 7.8.03).
2012-01-03 18:47:01 +01:00
ccc99317de
backport copyright and license headers from Emacs trunk
2011-08-24 22:32:38 +02:00
58f1dbccf8
Remove the "Version" header in Org libraries (leave it in org.el).
...
Also remove blank lines before the ";;; org*el ends here" declarations.
Having a "Version" header forced us to update every file when releasing a
new version of Org; it also forced us to update every file when merging Org
with Emacs trunk, thus cluttering the diffs between the previously merged
version and the new one with useless information.
Glenn Morris suggested this in emacs-devel:
http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00322.html
2011-08-17 14:42:34 +02:00
7a18799e25
Remove arch-tag at the bottom of files.
2011-08-15 20:04:38 +02:00
904ed18bc2
Fix copyright years for elisp files in core and contrib.
...
Also add "This file is not part of GNU Emacs." when this is the case.
2011-08-15 15:23:11 +02:00
7340cee33a
Update website to show 7.7 as current release
2011-07-28 10:33:35 +00:00
4c714198b4
ob-clojure.el: cosmetic reformatting of a defun.
2011-07-16 15:07:23 +02:00
52a14c5e2e
ob-clojure: respects "scalar" and "verbatim" results params
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Respects "scalar"
and "verbatim" results params.
2011-07-10 09:42:54 -06:00
c1465c5d00
ob-clojure: no longer force results into elisp if they don't naturally fit
...
* lisp/ob-clojure.el (org-babel-execute:clojure): No longer force
results into elisp if they don't naturally fit.
2011-07-10 09:42:54 -06:00
f0ab1bda95
ob-clojure: Stop re-reading already parsed lisp results.
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Stop re-reading
already parsed lisp results.
2011-07-10 09:42:54 -06:00
9c05a7c781
Bump to version 7.6
2011-07-06 21:06:03 +02:00
0bcdf0b72b
ob-clojure: force escaping of clojure source into elisp source
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Force escaping of
clojure source into elisp source.
2011-06-28 16:39:02 -07:00
93bcee0f98
ob-clojure: treat vectors as elisp lists
...
* lisp/ob-clojure.el (org-babel-execute:clojure): Convert vectors to
lists before reading into emacs-lisp.
2011-06-21 15:45:19 -07:00
4a0e5cf88f
initialize variable from ob-tangle in language files that use it
...
* lisp/ob-C.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-asymptote.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-awk.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-clojure.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-haskell.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-latex.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-lisp.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-ocaml.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-perl.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-python.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-ruby.el (ob-tangle): initialize variable from ob-tangle.
* lisp/ob-tangle.el (ob-tangle): initialize variable from ob-tangle.
2011-06-21 15:45:19 -07:00
c7ed6cde3a
ob-clojure: qualify pp dispatch functions, wrap body in (do )
...
Patch by Eric S Fraga
* lisp/ob-clojure.el (org-babel-expand-body:clojure): Qualify pp
dispatch functions, wrap body in `(do )'.
2011-04-29 08:26:01 -06:00
4a8640d0cf
ob-clojure: more robust reading of results
...
* lisp/ob-clojure.el (org-babel-execute:clojure): If results are not
readable by lisp, then return them as a string.
2011-04-28 12:21:17 -06:00
Paul Eggert
Oleh Krehel
Nicolas Goaziou
Bastien Guerry
Achim Gratz
Eric Schulte
Eric Schulte
emacs