浏览代码

remember the ob-comint-with-output is a macro

Eric Schulte 15 年之前
父节点
当前提交
ca3f3baca6

+ 1 - 1
lisp/babel/langs/ob-R.el

@@ -213,7 +213,7 @@ last statement in BODY, as elisp."
 		(output
 		 (mapconcat #'org-babel-chomp (list body org-babel-R-eoe-indicator) "\n"))))
 	     (raw
-	      (org-babel-comint-with-output (list session org-babel-R-eoe-output)
+	      (org-babel-comint-with-output (session org-babel-R-eoe-output)
 		(insert full-body) (inferior-ess-send-input)))
 	     (comint-prompt-regexp
 	      (concat "^\\("

+ 1 - 1
lisp/babel/langs/ob-haskell.el

@@ -72,7 +72,7 @@
          (full-body (org-babel-expand-body:haskell body params processed-params))
          (session (org-babel-prep-session:haskell session params))
          (raw (org-babel-comint-with-output
-		  (list session org-babel-haskell-eoe t full-body)
+		  (session org-babel-haskell-eoe t full-body)
                 (insert (org-babel-trim full-body))
                 (comint-send-input nil t)
                 (insert org-babel-haskell-eoe)

+ 1 - 1
lisp/babel/langs/ob-ocaml.el

@@ -64,7 +64,7 @@
          (full-body (org-babel-expand-body:ocaml body params processed-params))
          (session (org-babel-prep-session:ocaml session params))
          (raw (org-babel-comint-with-output
-		  (list session org-babel-ocaml-eoe-output t full-body)
+		  (session org-babel-ocaml-eoe-output t full-body)
                 (insert (concat (org-babel-chomp full-body) " ;;"))
                 (comint-send-input nil t)
                 (insert org-babel-ocaml-eoe-indicator)

+ 5 - 5
lisp/babel/langs/ob-octave.el

@@ -182,11 +182,11 @@ statement in BODY, as elisp."
 			   ;; available, so :results output currently
 			   ;; won't work
 		(org-babel-comint-with-output
-		    (list session
-			  (if matlabp
-			      org-babel-octave-eoe-indicator
-			    org-babel-octave-eoe-output)
-			  t full-body)
+		    (session
+		     (if matlabp
+			 org-babel-octave-eoe-indicator
+		       org-babel-octave-eoe-output)
+		     t full-body)
 		  (insert full-body) (comint-send-input nil t)))) results)
     (case result-type
       (value

+ 1 - 1
lisp/babel/langs/ob-python.el

@@ -218,7 +218,7 @@ last statement in BODY, as elisp."
     ;; comint session evaluation
     (org-babel-comint-in-buffer buffer
       (let* ((raw (org-babel-comint-with-output
-		      (list buffer org-babel-python-eoe-indicator t full-body)
+		      (buffer org-babel-python-eoe-indicator t full-body)
                     ;; for some reason python is fussy, and likes enters after every input
 		    (let ((comint-process-echoes nil))
 		      (mapc (lambda (statement) (insert statement) (comint-send-input))

+ 1 - 1
lisp/babel/langs/ob-ruby.el

@@ -214,7 +214,7 @@ last statement in BODY, as elisp."
                           org-babel-ruby-last-value-eval)
                    org-babel-ruby-eoe-indicator) "\n"))
            (raw (org-babel-comint-with-output
-		    (list buffer org-babel-ruby-eoe-indicator t full-body)
+		    (buffer org-babel-ruby-eoe-indicator t full-body)
                   (insert full-body) (comint-send-input nil t)))
            (results (cdr (member
 			  org-babel-ruby-eoe-indicator

+ 1 - 1
lisp/babel/langs/ob-sh.el

@@ -175,7 +175,7 @@ last statement in BODY."
                      (mapcar #'org-babel-sh-strip-weird-long-prompt
                              (mapcar #'org-babel-trim
                                      (org-babel-comint-with-output
-                                         (list session org-babel-sh-eoe-output t full-body)
+                                         (session org-babel-sh-eoe-output t full-body)
                                        (mapc (lambda (line) (insert line) (comint-send-input))
                                              (strip-empty (split-string body "\n")))
                                        (insert org-babel-sh-eoe-indicator)