Forráskód Böngészése

shell is now handling multiple sessions

Eric Schulte 16 éve
szülő
commit
2dea1ea367
2 módosított fájl, 20 hozzáadás és 6 törlés
  1. 4 4
      lisp/langs/org-babel-shell.el
  2. 16 2
      org-babel.org

+ 4 - 4
lisp/langs/org-babel-shell.el

@@ -124,10 +124,10 @@ last statement in BODY."
       (setq results (cdr (member org-babel-shell-eoe-output
                                  (reverse (mapcar #'org-babel-trim (split-string string-buffer comint-prompt-regexp))))))
       ;; (message (format "processed-results=%S" results)) ;; debugging
-      (case result-type
-        (output (org-babel-trim (mapconcat #'org-babel-trim (reverse results) "\n")))
-        (value (car results))
-        (t (reverse results))))))
+      (or (case result-type
+            (output (org-babel-trim (mapconcat #'org-babel-trim (reverse results) "\n")))
+            (value (car results))
+            (t (reverse results))) ""))))
 
 (provide 'org-babel-shell)
 ;;; org-babel-shell.el ends here

+ 16 - 2
org-babel.org

@@ -587,7 +587,7 @@ echo $other ' is the old date'
 #+resname: task-call-other-shell
 : $ Fri Jun 12 13:08:37 PDT 2009  is the old date
 
-*** TODO implement a *session* header argument [2/4]
+*** TODO implement a *session* header argument [3/4]
 =:session= header argument to override the default *session* buffer
 
 **** DONE ruby
@@ -625,7 +625,21 @@ what
 #+resname: python-get-from-session
 : 98
 
-**** TODO shell
+**** DONE shell
+
+#+srcname: task-shell-sessions
+#+begin_src sh :session what
+WHAT='patton'
+#+end_src
+
+#+srcname: task-shell-sessions-what
+#+begin_src sh :session what :results replace
+echo $WHAT
+#+end_src
+
+#+resname: task-shell-sessions-what
+: patton
+
 **** TODO R
 *** TODO function to bring up inferior-process buffer