Explorar el Código

slightly more graceful use of let*

Eric Schulte hace 16 años
padre
commit
cd5fb8460d
Se han modificado 2 ficheros con 5 adiciones y 8 borrados
  1. 3 4
      lisp/langs/org-babel-python.el
  2. 2 4
      lisp/langs/org-babel-ruby.el

+ 3 - 4
lisp/langs/org-babel-python.el

@@ -112,15 +112,14 @@ BODY, if RESULT-TYPE equals 'value then return the value of the
 last statement in BODY."
   (org-babel-comint-in-buffer buffer
     (let* ((full-body (mapconcat #'org-babel-trim
-                                (list body org-babel-python-last-value-eval org-babel-python-eoe-indicator) "\n"))
+                                 (list body org-babel-python-last-value-eval org-babel-python-eoe-indicator) "\n"))
            (raw (org-babel-comint-with-output buffer org-babel-python-eoe-indicator t
                   ;; for some reason python is fussy, and likes enters after every input
                   (mapc (lambda (statement) (insert statement) (comint-send-input))
                         (split-string full-body "[\r\n]+"))))
-           results)
-      (setq results (delete org-babel-python-eoe-indicator
+           (results (delete org-babel-python-eoe-indicator
                             (cdr (member org-babel-python-eoe-indicator
-                                         (reverse (mapcar #'org-babel-trim raw))))))
+                                         (reverse (mapcar #'org-babel-trim raw)))))))
       (setq results (mapcar #'org-babel-python-read-string results))
       (org-babel-trim (case result-type
                         (output (mapconcat #'identity (reverse (cdr results)) "\n"))

+ 2 - 4
lisp/langs/org-babel-ruby.el

@@ -101,11 +101,9 @@ last statement in BODY."
                                (list body org-babel-ruby-last-value-eval org-babel-ruby-eoe-indicator) "\n"))
          (raw (org-babel-comint-with-output buffer org-babel-ruby-eoe-indicator t
                 (insert full-body) (comint-send-input)))
-         results)
-    ;; clean up results
-    (setq results (cdr (member org-babel-ruby-eoe-indicator
+         (results (cdr (member org-babel-ruby-eoe-indicator
                                (reverse (mapcar #'org-babel-ruby-read-string
-                                                (mapcar #'org-babel-trim raw))))))
+                                                (mapcar #'org-babel-trim raw)))))))
     (case result-type
       (output (mapconcat #'identity (reverse (cdr results)) "\n"))
       (value (car results))