| commit | 72ccd88c976b51feeb9fa782330f062a3d22b904 | |
| author | Dan Davison <davison@stats.ox.ac.uk> | |
| Fri, 17 Jul 2009 13:54:11 +0000 (17 09:54 -0400) | ||
| committer | Dan Davison <davison@stats.ox.ac.uk> | |
| Fri, 17 Jul 2009 13:54:11 +0000 (17 09:54 -0400) | ||
| tree | f8a6db9cd515dfe7a52f4260193b5b72760de7c8 | treesnapshot (tar.gz zip) |
| parent | 5d49db67ab5619b8b83f71ee8551b66984ac181a | commitdiff |
| parent | 1fa18830abdcd1c97433923740904b3bcce74499 | commitdiff |
Merging master into results.
THis brings in the bugfix from 4f15280631744019c3696751b4e16b155fe4bf7d, as well as gnuplot. The bugfix required manual resolution as it had already been partially addressed in this branch. Also, the interaction of the possibility of being on a #+lob line and the possiblity of being in the middle of an org-babel-exp-results call, meant I had to rearrange things a bit, so this commit has new changes in org-babel-where-is-src-block-result in addition to the merge.
THis brings in the bugfix from 4f15280631744019c3696751b4e16b155fe4bf7d, as well as gnuplot. The bugfix required manual resolution as it had already been partially addressed in this branch. Also, the interaction of the possibility of being on a #+lob line and the possiblity of being in the middle of an org-babel-exp-results call, meant I had to rearrange things a bit, so this commit has new changes in org-babel-where-is-src-block-result in addition to the merge.
| lisp/org-babel.el | diff1 | diff2 | blobhistory |
| org-babel.org | diff1 | diff2 | blobhistory |