Commit Graph

386 Commits

Author SHA1 Message Date
Bastien Guerry afe5eb140e Fix some docstrings format.
* org-src.el (org-edit-src-code): Fix docstring formatting.

* ob.el (org-babel-do-key-sequence-in-edit-buffer): Ditto.
2012-07-11 19:33:29 +02:00
Bastien Guerry 7b6171735f Prevent errors when `org-current-export-file' is void.
* ob.el (org-babel-confirm-evaluate): Prevent errors when
`org-current-export-file' is void.

Thanks to John Wiegley for reporting this.
2012-07-10 22:07:43 +02:00
Eric Schulte 89bb446a0b caching in #+call: lines
* lisp/ob.el (org-babel-set-current-result-hash): Change the hash of the
  results for the current code block.
  (org-babel-current-result-hash): Fix documentation.
* lisp/ob-lob.el (org-babel-lob-execute): Don't re-execute the called
  function if the current call line hash matches that in its results.
2012-06-28 11:49:47 -06:00
Hans-Peter Deifel 343a705ba5 allow relative file names for :dir
TINYCHANGE

* lisp/ob.el (org-babel-execute-src-block): Allow the :dir header
  argument to take relative file names.
2012-06-05 08:52:24 -06:00
Bastien Guerry 31aa82c998 Merge branch 'maint' 2012-05-23 12:13:39 +02:00
Eric Schulte f64a859db8 force cap of auto-inserted begin/end example block
* lisp/ob.el (org-babel-capitalize-examplize-region-markers): Controls
  the capitalization of begin and end example blocks.
  (org-babel-examplize-region): Optionally capitalize example block
  delimiters.
2012-05-21 09:46:47 -04:00
Eric Schulte 68c5a2f840 Merge branch 'origin-maint' 2012-05-16 13:15:55 -04:00
Eric Schulte 1b21168d52 save match data during indentation check
Thanks to Karl Berg for pointing out this issue.
2012-05-16 13:15:36 -04:00
Eric Schulte 4eb4010a97 Merge branch 'origin-maint'
Conflicts:
	lisp/ob.el
2012-04-28 18:03:23 -04:00
Eric Schulte 604a55edd6 fixes a bug finding empty named results
* lisp/ob.el (org-babel-find-named-result): Fix bug finding empty
  named results.
2012-04-28 18:02:13 -04:00
Bastien Guerry 1c203d8d19 Match #+name/#+tblname/#+tblfm along with uppercase twins.
* org.el: Use (case-fold-search t).
(org-edit-special, org-ctrl-c-ctrl-c): Ditto.

* org-table.el:
(org-table-store-formulas, org-table-get-stored-formulas)
(org-table-fix-formulas, org-table-edit-formulas)
(org-old-auto-fill-inhibit-regexp, orgtbl-ctrl-c-ctrl-c)
(orgtbl-toggle-comment, org-table-get-remote-range): Ditto.

* org-footnote.el:
(org-footnote-goto-local-insertion-point): Ditto.

* org-exp.el: Ditto.

* org-colview.el:
(org-dblock-write:columnview, org-dblock-write:columnview):
Ditto.

* org-colview-xemacs.el:
(org-dblock-write:columnview): Ditto.

* org-clock.el (org-clocktable-write-default): Ditto.

* org-capture.el (org-capture-place-table-line): Ditto.

* ob.el (org-babel-data-names, org-babel-goto-named-src-block)
(org-babel-src-block-names)
(org-babel-where-is-src-block-result, org-babel-result-end)
(org-babel-where-is-src-block-head)
(org-babel-find-named-result, org-babel-result-names): Ditto.
2012-04-23 12:48:33 +02:00
Bastien Guerry a6349c2f50 Fix compiler warnings. 2012-04-17 11:17:17 +02:00
Eric Schulte bc473299f1 safer equality test in org-babel-header-arg-expand
* lisp/ob.el (org-babel-header-arg-expand): In new
  buffers (char-before) may return nil so use equal rather than =.
2012-04-14 09:32:57 -04:00
Eric Schulte 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
Bastien Guerry b846a86cfa Add :version to ob.el options. 2012-04-03 13:28:23 +02:00
Bastien Guerry e3913a2ab5 Merge branch 'hotfix-7.8.06' 2012-04-02 00:53:37 +02:00
Bastien Guerry 5c38bf0ef7 Fix copyright and authors lines. 2012-04-02 00:53:28 +02:00
Eric Schulte 670c7f31cc simplified implementation of :file-desc header argument
This will no longer insert the value of the :file header argument as
  the description if the description is left blank (as this changes
  the meaning of the :file header argument).

  The desc handling logic is moved to the `org-babel-result-to-file'
  function.

* lisp/ob.el (org-babel-result-to-file): New optional description
  argument.
  (org-babel-insert-result): Moved description logic to another
  function.
2012-03-31 14:59:26 -04:00
Eric Schulte 59800b2816 change name of filelinkdescr to file-desc
* lisp/ob.el (org-babel-insert-result): Change name of filelinkdescr
  to file-desc.
  (org-babel-common-header-args-w-values): Change name of
  filelinkdescr to file-desc.
2012-03-31 14:30:05 -04:00
Andreas Leha a58a4f0ad4 new source block header argument :filelinkdescr 2012-03-31 14:30:04 -04:00
Eric Schulte 90336ceb49 Fixed bug in export of Org-mode code blocks
* lisp/ob-exp.el (org-babel-exp-code): Escape all lines when exporting
  Org-mode blocks.
* lisp/ob.el (org-babel-parse-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-parse-inline-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-strip-protective-commas): Now accepts a language
  argument.

Conflicts:

	lisp/ob-exp.el
2012-03-31 12:55:23 -04:00
Eric Schulte d6ddb59203 Fixed bug in export of Org-mode code blocks
* lisp/ob-exp.el (org-babel-exp-code): Escape all lines when exporting
  Org-mode blocks.
* lisp/ob.el (org-babel-parse-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-parse-inline-src-block-match): Make use of the new
  language argument to org-babel-strip-protective-commas.
  (org-babel-strip-protective-commas): Now accepts a language
  argument.
2012-03-31 12:49:07 -04:00
Eric Schulte a4efcc3a39 Merge branch 'origin-hotfix-7.8.06' 2012-03-27 07:12:17 -04:00
Eric Schulte dbe4bf805f fix bug in indented wrapped results insertion
* lisp/ob.el (org-babel-insert-result): Fix bug in indented wrapped
  results insertion.
* testing/lisp/test-ob.el (test-ob/org-babel-results-indented-wrap):
  Test correct indentation behavior.
2012-03-27 07:09:22 -04:00
Eric Schulte 7b172ade00 Merge branch 'origin-hotfix-7.8.06' 2012-03-26 07:20:37 -04:00
Eric Schulte 1ca7485a88 don't truncate results name on call line execution
* lisp/ob.el (org-babel-where-is-src-block-result): Don't truncate
  results name on call line execution.
2012-03-26 07:18:31 -04: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 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
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
Bastien Guerry 6e306f65ff Fix copyright years in maint. 2012-03-17 16:31:04 +01:00
Bastien Guerry de42649f7b Manually revert maint to e85080.
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
2012-03-17 16:28:46 +01:00
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry 38c5045725 Fix copyright years. 2012-03-17 14:36:25 +01:00
Bastien Guerry 6e534f9c61 Manually revert back to commit e85080.
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.

This commit reverts back the maint branch to its state before
merging the master branch.  From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
2012-03-17 14:34:01 +01:00
Eric Schulte 3f4383baa4 add "eval" option to noweb
* lisp/ob.el (org-babel-merge-params): Add "eval" as acceptable noweb
  argument.
  (org-babel-noweb-p): The "eval" argument only expands during
  evaluation.
2012-03-14 15:12:44 -04:00
Eric Schulte 07ac15ef72 Merge branch 'origin-maint'
Conflicts:
	lisp/org-src.el
2012-03-14 09:56:52 -04:00
Eric Schulte 4542824f2c fix compiler warnings
* lisp/ob.el (org-strip-protective-commas): Declared.
* lisp/org-agenda.el (org-agenda-filtered-by-category): Declared.
  (org-agenda-filter-apply): Capture free variable.
* lisp/org-footnote.el (org-skip-whitespace): Declared.
* lisp/org-mobile.el (org-agenda-filter): Declared.
* lisp/org-src.el (org-strip-protective-commas): Declared.
2012-03-14 09:55:04 -04:00
Eric Schulte de09874a27 Merge branch 'origin-maint' 2012-03-12 08:41:38 -04:00
Eric Schulte d5e21f43fc Ensure correct order for empty result wrapping blocks.
* lisp/ob.el (org-babel-insert-result): Ensure correct order for empty
  result wrapping blocks.
2012-03-12 08:40:43 -04:00
Bastien Guerry 0630d89a0c Merge branch 'maint' of orgmode.org:org-mode 2012-03-05 21:10:22 +01:00
Eric Schulte 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
Eric Schulte 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
Eric Schulte 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
Eric Schulte 451f7cc31f Merge branch 'origin-maint' 2012-03-01 13:15:06 -07:00
Eric Schulte 5bcf0c16da Don't miss a code block when there are confounding spaces after the result name.
* lisp/ob.el (org-babel-find-named-result): Don't miss a code block
  when there are confounding spaces after the result name.
2012-03-01 13:15:00 -07:00
Eric Schulte 1ed518109e Merge branch 'origin-maint' 2012-03-01 11:38:24 -07:00
Eric Schulte 9e3b41d1a4 Fixed bug in examplization
* lisp/ob.el (org-babel-examplize-region): Fixed bug in examplization.
2012-03-01 11:38:05 -07:00
Eric Schulte e5fa93c9be fix two build complaints 2012-02-29 09:28:34 -07:00