mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-25 10:02:52 +00:00
Code Releases Activity

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Browse source
This commit is contained in:
Carsten Dominik 2010-04-02 07:34:17 +02:00
parent 999d09058b 500a88f032
commit e6cf75c1f4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ORGWEBPAGE/Changes.org
View file

@ -469,7 +469,7 @@ So when you are prompted for a date, you can now answer like this
There is now only a single free timer supported by org-timer.el.
Thanks to Bastien for cleaning this up, after a bug report in
this area by Frederic Couchet.
this area by Frédéric Couchet.
*** Remember: Allow to file as sibling of current clock

3
contrib/babel/lisp/langs/org-babel-R.el
View file

@ -113,6 +113,7 @@ called by `org-babel-execute-src-block'."
(:jpeg . "jpeg")
(:tiff . "tiff")
(:png . "png")
(:svg . "svg")
(:pdf . "pdf")
(:ps . "postscript")
(:postscript . "postscript")))
@ -123,7 +124,7 @@ called by `org-babel-execute-src-block'."
(device (and (string-match ".+\\.\\([^.]+\\)" out-file) (match-string 1 out-file)))
(extra-args (cdr (assq :R-dev-args params))) filearg args)
(setq device (or (and device (cdr (assq (intern (concat ":" device)) devices))) "png"))
(setq filearg (if (member device '("pdf" "postscript")) "file" "filename"))
(setq filearg (if (member device '("pdf" "postscript" "svg")) "file" "filename"))
(setq args (mapconcat (lambda (pair)
(if (member (car pair) allowed-args)
(format ",%s=%s" (substring (symbol-name (car pair)) 1) (cdr pair)) ""))