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

ORGWEBPAGE/Changes.org

@@ -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
     

contrib/babel/lisp/langs/org-babel-R.el

@@ -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)) ""))