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

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

@@ -184,7 +184,10 @@ or nil if \"none\" is specified"
   "Finish setting up the bindings of org-babel session to a slime-clojure repl"
   (let ((pending-session (pop org-babel-clojure-pending-sessions)))
     (when pending-session
-      (org-babel-clojure-bind-session-to-repl-buffer pending-session (slime-output-buffer)))))
+      (save-excursion
+        (switch-to-buffer (slime-output-buffer))
+        (rename-buffer (if (stringp pending-session) pending-session (symbol-name pending-session)))
+        (org-babel-clojure-bind-session-to-repl-buffer pending-session (slime-output-buffer))))))
 
 (add-hook 'slime-connected-hook 'org-babel-clojure-session-connected-hook)
 

contrib/babel/lisp/org-babel.el

@@ -865,7 +865,9 @@ parameters when merging lists."
 			(:file
 			 (when (cdr pair)
 			   (setq results (e-merge results-exclusive-groups results '("file")))
-			   (unless (or (member "both" exports) (member "none" exports))
+			   (unless (or (member "both" exports)
+                                       (member "none" exports)
+                                       (member "code" exports))
 			     (setq exports (e-merge exports-exclusive-groups exports '("results"))))
 			   (setq params (cons pair (assq-delete-all (car pair) params)))))
                         (:exports