ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Carsten Dominik 2010-01-10 08:34:43 +01:00
parent 26eac8b600 baa98c1f14
commit 35a8ec1537
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/babel/lisp/langs/org-babel-clojure.el
View File

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

4
contrib/babel/lisp/org-babel.el
View File

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