瀏覽代碼

babel: Make temp file names consistent

	* ob-scheme.el (org-babel-execute:scheme): Alter temp file name

	* ob-ruby.el (org-babel-ruby-evaluate): Alter temp file name

	* ob-python.el (org-babel-python-evaluate-external-process):
	Alter temp file name

	* ob-perl.el (org-babel-perl-evaluate): Alter temp file name

	* ob-octave.el (org-babel-octave-evaluate-session):
	Alter temp file name
	(org-babel-octave-import-elisp-from-file): Alter temp file name

	* ob-ledger.el (org-babel-execute:ledger): Alter temp file name

	* ob-gnuplot.el (org-babel-gnuplot-process-vars): Alter temp
	file name
	(org-babel-execute:gnuplot): Alter temp file name
Dan Davison 14 年之前
父節點
當前提交
9993463c4d
共有 7 個文件被更改,包括 9 次插入10 次删除
  1. 2 2
      lisp/ob-gnuplot.el
  2. 1 2
      lisp/ob-ledger.el
  3. 2 2
      lisp/ob-octave.el
  4. 1 1
      lisp/ob-perl.el
  5. 1 1
      lisp/ob-python.el
  6. 1 1
      lisp/ob-ruby.el
  7. 1 1
      lisp/ob-scheme.el

+ 2 - 2
lisp/ob-gnuplot.el

@@ -68,7 +68,7 @@ code."
       (car pair) ;; variable name
       (car pair) ;; variable name
       (if (listp (cdr pair)) ;; variable value
       (if (listp (cdr pair)) ;; variable value
           (org-babel-gnuplot-table-to-data
           (org-babel-gnuplot-table-to-data
-           (cdr pair) (org-babel-temp-file "gnuplot") params)
+           (cdr pair) (org-babel-temp-file "gnuplot-") params)
         (cdr pair))))
         (cdr pair))))
    (org-babel-ref-variables params)))
    (org-babel-ref-variables params)))
 
 
@@ -141,7 +141,7 @@ This function is called by `org-babel-execute-src-block'."
     (save-window-excursion
     (save-window-excursion
       ;; evaluate the code body with gnuplot
       ;; evaluate the code body with gnuplot
       (if (string= session "none")
       (if (string= session "none")
-          (let ((script-file (org-babel-temp-file "gnuplot-script")))
+          (let ((script-file (org-babel-temp-file "gnuplot-script-")))
             (with-temp-file script-file
             (with-temp-file script-file
               (insert (concat body "\n")))
               (insert (concat body "\n")))
             (message "gnuplot \"%s\"" script-file)
             (message "gnuplot \"%s\"" script-file)

+ 1 - 2
lisp/ob-ledger.el

@@ -50,8 +50,7 @@ called by `org-babel-execute-src-block'."
   (let ((result-params (split-string (or (cdr (assoc :results params)) "")))
   (let ((result-params (split-string (or (cdr (assoc :results params)) "")))
 	(cmdline (cdr (assoc :cmdline params)))
 	(cmdline (cdr (assoc :cmdline params)))
         (in-file (org-babel-temp-file "ledger-"))
         (in-file (org-babel-temp-file "ledger-"))
-	(out-file (org-babel-temp-file "ledger-output-"))
-	)
+	(out-file (org-babel-temp-file "ledger-output-")))
     (with-temp-file in-file (insert body))
     (with-temp-file in-file (insert body))
     (message (concat "ledger"
     (message (concat "ledger"
 		     " -f " (org-babel-process-file-name in-file)
 		     " -f " (org-babel-process-file-name in-file)

+ 2 - 2
lisp/ob-octave.el

@@ -189,7 +189,7 @@ value of the last statement in BODY, as elisp."
 (defun org-babel-octave-evaluate-session
 (defun org-babel-octave-evaluate-session
   (session body result-type &optional matlabp)
   (session body result-type &optional matlabp)
   "Evaluate BODY in SESSION."
   "Evaluate BODY in SESSION."
-  (let* ((tmp-file (org-babel-temp-file "results-"))
+  (let* ((tmp-file (org-babel-temp-file (if matlabp "matlab-" "octave-")))
 	 (wait-file (org-babel-temp-file "matlab-emacs-link-wait-signal-"))
 	 (wait-file (org-babel-temp-file "matlab-emacs-link-wait-signal-"))
 	 (full-body
 	 (full-body
 	  (case result-type
 	  (case result-type
@@ -250,7 +250,7 @@ value of the last statement in BODY, as elisp."
   "Import data from FILE-NAME.
   "Import data from FILE-NAME.
 This removes initial blank and comment lines and then calls
 This removes initial blank and comment lines and then calls
 `org-babel-import-elisp-from-file'."
 `org-babel-import-elisp-from-file'."
-  (let ((temp-file (org-babel-temp-file "results-")) beg end)
+  (let ((temp-file (org-babel-temp-file "octave-matlab-")) beg end)
     (with-temp-file temp-file
     (with-temp-file temp-file
       (insert-file-contents file-name)
       (insert-file-contents file-name)
       (re-search-forward "^[ \t]*[^# \t]" nil t)
       (re-search-forward "^[ \t]*[^# \t]" nil t)

+ 1 - 1
lisp/ob-perl.el

@@ -107,7 +107,7 @@ return the value of the last statement in BODY, as elisp."
   (when session (error "Sessions are not supported for Perl."))
   (when session (error "Sessions are not supported for Perl."))
   (case result-type
   (case result-type
     (output (org-babel-eval org-babel-perl-command body))
     (output (org-babel-eval org-babel-perl-command body))
-    (value (let ((tmp-file (org-babel-temp-file "perl-results-")))
+    (value (let ((tmp-file (org-babel-temp-file "perl-")))
 	     (org-babel-eval
 	     (org-babel-eval
 	      org-babel-perl-command
 	      org-babel-perl-command
 	      (format org-babel-perl-wrapper-method body
 	      (format org-babel-perl-wrapper-method body

+ 1 - 1
lisp/ob-python.el

@@ -210,7 +210,7 @@ string. If RESULT-TYPE equals 'value then return the value of the
 last statement in BODY, as elisp."
 last statement in BODY, as elisp."
   (case result-type
   (case result-type
     (output (org-babel-eval org-babel-python-command body))
     (output (org-babel-eval org-babel-python-command body))
-    (value (let ((tmp-file (org-babel-temp-file "python-results-")))
+    (value (let ((tmp-file (org-babel-temp-file "python-")))
 	     (org-babel-eval org-babel-python-command
 	     (org-babel-eval org-babel-python-command
 			     (format
 			     (format
 			      (if (member "pp" result-params)
 			      (if (member "pp" result-params)

+ 1 - 1
lisp/ob-ruby.el

@@ -221,7 +221,7 @@ return the value of the last statement in BODY, as elisp."
 	  (if (or (member "code" result-params) (member "pp" result-params))
 	  (if (or (member "code" result-params) (member "pp" result-params))
 	      results
 	      results
 	    (org-babel-ruby-table-or-string results)))
 	    (org-babel-ruby-table-or-string results)))
-	(let* ((tmp-file (org-babel-temp-file "ruby-results-"))
+	(let* ((tmp-file (org-babel-temp-file "ruby-"))
 	       (ppp (or (member "code" result-params)
 	       (ppp (or (member "code" result-params)
 			(member "pp" result-params))))
 			(member "pp" result-params))))
 	  (org-babel-comint-with-output
 	  (org-babel-comint-with-output

+ 1 - 1
lisp/ob-scheme.el

@@ -90,7 +90,7 @@ This function is called by `org-babel-execute-src-block'"
 		(insert (org-babel-chomp line)) (comint-send-input nil t))
 		(insert (org-babel-chomp line)) (comint-send-input nil t))
 	      (list body (format "%S" org-babel-scheme-eoe)))))
 	      (list body (format "%S" org-babel-scheme-eoe)))))
        ;; external evaluation
        ;; external evaluation
-       (let ((script-file (org-babel-temp-file "lisp-script-")))
+       (let ((script-file (org-babel-temp-file "scheme-script-")))
          (with-temp-file script-file
          (with-temp-file script-file
            (insert
            (insert
             ;; return the value or the output
             ;; return the value or the output