0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-24 00:10:43 +00:00
Commit graph

3532 commits

Author SHA1 Message Date
Eric Schulte 49db1e523c Merge branch 'master' into session
Conflicts:
	org-babel.org
2009-06-03 15:30:10 -07:00
Eric Schulte 39f7174884 Revert "Revert "Make org table result have header row and hline when appropriate...""
This reverts commit dff01091dc.

Yes, this is a reversion of a reversion, as the original commit has
been reverted in the master branch, I'm now just going to revert the
reversion and then merge with master to maintain inter-branch
cohesion.

oh, did I mention... "revert"
2009-06-03 15:26:32 -07:00
Eric Schulte b1c103890c *even more* discussion of session implementation issues 2009-06-03 15:23:45 -07:00
Dan Davison 8ac2a7daa6 Added another multilingual example. One issue is that spaces in the string cause vector output. 2009-06-03 12:33:58 -04:00
Dan Davison 02b265b2e3 Reverted tentative and hackish support for hline in R output. I have left a commented line and an unused function while I am thinking about this, and pending me learning git better. However I haven't yet reverted the ability of R to recognise hlines in var references, so the grades example still works. All sbe tests are passed. 2009-06-03 12:09:52 -04:00
Dan Davison 21d01aea91 Some notes on possible support for named fields / rows / columns in org-babel and supported languages. These are just preliminary and don't outline a solution. My feeling is that this will require a bit more thought to avoid being an unrigorous hack. 2009-06-03 11:32:24 -04:00
Carsten Dominik 3ca7add20a Fix bug with time sorting
Reported by Jörg Hagmann.
2009-06-03 17:15:16 +02:00
Carsten Dominik 45d80c3a31 Remove flyspell overlays in places where they are not wanted 2009-06-03 14:38:23 +02:00
Carsten Dominik 97f9817836 Insert drawers/ planning info unindented when org-adapt-indentation is nil
Requested by Samuel Wales
2009-06-03 14:08:37 +02:00
Carsten Dominik 470fba6086 org-R.el: Updated.
New version from Dan Davison.
2009-06-03 11:14:02 +02:00
Carsten Dominik 1371cad310 Document the solution for the YASnippet/org-mode problem 2009-06-03 09:17:40 +02:00
Eric Schulte bbf89dea08 fixed type in org-babel.org 2009-06-02 20:50:10 -07:00
Eric Schulte dccbe633c9 discuss complication of mixing functional and imperative block evaluation 2009-06-02 20:34:20 -07:00
Eric Schulte dff01091dc Revert "Make org table result have header row and hline when appropriate..."
This reverts commit e4263daf76.

I'm reverting this commit in the sesion branch because it is breaking
the tests for R, as it no longer allows R source code blocks to return
scalar values.  Hopefully this issue will be fixed in the master
branch before I merge the session branch back in.
2009-06-02 16:29:30 -07:00
Eric Schulte 517253a2d0 beginning to add sessions 2009-06-02 16:28:56 -07:00
Eric Schulte bba80bb837 working on sessions 2009-06-02 16:26:57 -07:00
Eric Schulte f383f7e30c added integration directory for org-tangle (from Eric N.'s into email) 2009-06-02 15:31:26 -07:00
Dan Davison 0df550d84c Minor updates and responses in the sessions planning subtree. 2009-06-02 16:45:31 -04:00
Carsten Dominik 5e39f24715 Minor fixes 2009-06-02 19:12:30 +02:00
Carsten Dominik cc3bb658ec Editing Source Code Examples: Make C-x C-s save the original buffer
Path by Dan Davison
2009-06-02 18:01:25 +02:00
Carsten Dominik 90c38a0045 Clock: Improve messages 2009-06-02 17:10:23 +02:00
Carsten Dominik a5dc9456dd New option `org-clock-out-switch-to-state'.
Can be used to change the TODO state when clocking out.
2009-06-02 17:01:11 +02:00
Carsten Dominik 8a2247454c Bug fix 2009-06-02 16:36:16 +02:00
Carsten Dominik b95c2a5e9a Better treatment of face inheritance. 2009-06-02 14:50:19 +02:00
Carsten Dominik 1db461321a Keep compiler happy 2009-06-02 14:49:38 +02:00
Carsten Dominik 36caef0fc0 Makefile: Use ${MAKE} instead of "make"
Proposal by Friedrich Delgado Friedrichs
2009-06-02 14:15:00 +02:00
Carsten Dominik ee4bcda0e9 Clock: More control about what time is shown in mode line while clocking
This commit changes which time is shown in the mode line while
clocking.  Normally this will now be the total time ever clocked on
this task and its children.

However, when the task is a repeating one, only the time since the
last reset of the task will be shown.  The time of the last reset is
now recorded in a LAST_REPEAT property.

You can also set the CLOCK_MODELINE_TOTAL property to the value
"current" to only show the current clocking instance.  Or it may be
the value "today", to only add up the time spent today on this task.
Other possible values are "repeat", "all", or "auto".

Finally, you can set your default for this property with
`org-clock-modeline-total'.
2009-06-02 13:47:50 +02:00
Carsten Dominik 9b823a4586 Repeating entries: Record last repeat time in LAST_REPEAT property 2009-06-02 12:05:16 +02:00
Carsten Dominik 75bce09157 Update targets in the Makefile 2009-06-02 10:29:06 +02:00
Carsten Dominik 1dd08dc508 org-exp-blocks.el: Allow adding new block types
Patch by Eric Schulte.
2009-06-02 09:45:08 +02:00
Carsten Dominik 6c5428d5d4 Block editing: Do not quote # lines if there is no plus after # 2009-06-02 09:39:50 +02:00
Carsten Dominik 7579957978 Acknowledgment 2009-06-02 09:30:06 +02:00
Carsten Dominik bfa7c38c1c Hide and show the contents of blocks
Patch by Eric Schulte, with modifications.
2009-06-02 09:23:00 +02:00
Eric Schulte 37758310e0 planning *session* task order, and separating "*Org Edit Src Example* buffer" tasks 2009-06-01 17:58:37 -07:00
Eric Schulte fcd5e8f272 fleshing out the *sessions* discussion and TODOs 2009-06-01 17:28:34 -07:00
Eric Schulte c38294d21f DONE Remove protective commas from # comments before evaluating 2009-06-01 16:56:59 -07:00
Dan Davison 8fef1f0509 More notes on sessions: need for header arg evaluation when we edit code, and need for removing protective commas 2009-06-01 15:14:35 -04:00
Dan Davison f03e3ed603 Further notes on org-babel session and ESS and *Org Edit Src Example* buffers. 2009-05-31 18:07:13 -04:00
Dan Davison ce96d45374 Added reminder/request that we bear ESS in mind when designing org-babel 'sessions' 2009-05-31 17:48:00 -04:00
Dan Davison e4263daf76 Make org table result have header row and hline when appropriate. (This should have been included with commit a39d68640e). The approach I've taken is to make R always write the column names into the tsv file. If the result does not have user-supplied column-names, then R writes default column names of the form V1,V2,...,V$numcols. After reading the tsv back into lisp, we check whether it has "real" column names or the R defaults. If it has real column names, then I give the org table an hline.
I expect this will conflict with Eric's work on sessions, but we can deal with that.

There is a remaining quoting issue that needs to be dealt
with. E.g. with an unquoted string in the input, it comes out as
quoted in the result. This seems bad, since if you use the output as
new input you get something different (with extra
quoting). (non-idempotence if that's the right term).

| col1 | col2    | col3 |
|------+---------+------|
|    1 | 2       |    3 |
|    4 | schulte |    6 |

tabel

| "col1" | "col2"    | "col3" |
|--------+-----------+--------|
|      1 | 2         |      3 |
|      4 | "schulte" |      6 |
2009-05-30 16:45:26 -04:00
Dan Davison eb29bef93f Made org-babel-remove-result interactive. Eric if you agree do you want to decide on a binding? 2009-05-30 15:59:46 -04:00
Dan Davison e7f860cb19 Altered the python code in the chained references example. AIui the example was producing the correct answer (ruby class Array) but for the wrong reason (python was returning None) 2009-05-30 15:01:55 -04:00
Dan Davison a39d68640e Allowing org-tables with hline to be referred to and passed into R. If hline is present, the first row of the table becomes the column names in R. This allows the grades example to run for me which was not true before. Eric: any commits I make should be viewed as tentative -- feel free to reject or recode them. 2009-05-30 15:00:06 -04:00
Carsten Dominik 831050b23d Add Effort property to completion list. 2009-05-30 07:44:02 +02:00
Carsten Dominik 0b5dcee06d Minor fixes 2009-05-30 06:59:46 +02:00
Dan Davison 2ca59eaa0f Preventing end of buffer error when no newline after #+end_src 2009-05-29 23:34:50 -04:00
Eric Schulte f87a673c9c replacing parts of org-babel lost in a merge
namely some extended discussion of environments and sessions under
  the "Create objects in top level (global) environment in R?" header
2009-05-29 18:01:38 -07:00
Eric Schulte d49084b73d small additions to org-babel-comint.el 2009-05-29 17:45:40 -07:00
Eric Schulte 2fe76cd094 adding discussion to PROPOSED conversion between org-babel and noweb (e.g. .Rnw) format 2009-05-29 17:45:25 -07:00
Eric Schulte 986fcb4652 DONE pass multiple reference arguments into R
This should be working, see the following example...

n + m

: 10
2009-05-29 16:45:03 -07:00