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

7 files changed, 9 insertions, 10 deletions

diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 81f9295..cfe80d8 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -68,7 +68,7 @@ code."
       (car pair) ;; variable name
       (if (listp (cdr pair)) ;; variable value
           (org-babel-gnuplot-table-to-data
-           (cdr pair) (org-babel-temp-file "gnuplot") params)
+           (cdr pair) (org-babel-temp-file "gnuplot-") params)
         (cdr pair))))
    (org-babel-ref-variables params)))
 
@@ -141,7 +141,7 @@ This function is called by `org-babel-execute-src-block'."
     (save-window-excursion
       ;; evaluate the code body with gnuplot
       (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
               (insert (concat body "\n")))
             (message "gnuplot \"%s\"" script-file)
diff --git a/lisp/ob-ledger.el b/lisp/ob-ledger.el
index 86a008b..d1d0f95 100644
--- a/lisp/ob-ledger.el
+++ b/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)) "")))
 	(cmdline (cdr (assoc :cmdline params)))
         (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))
     (message (concat "ledger"
 		     " -f " (org-babel-process-file-name in-file)
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index b064ff4..b25ab8a 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -189,7 +189,7 @@ value of the last statement in BODY, as elisp."
 (defun org-babel-octave-evaluate-session
   (session body result-type &optional matlabp)
   "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-"))
 	 (full-body
 	  (case result-type
@@ -250,7 +250,7 @@ value of the last statement in BODY, as elisp."
   "Import data from FILE-NAME.
 This removes initial blank and comment lines and then calls
 `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
       (insert-file-contents file-name)
       (re-search-forward "^[ \t]*[^# \t]" nil t)
diff --git a/lisp/ob-perl.el b/lisp/ob-perl.el
index b9c5a86..96443fe 100644
--- a/lisp/ob-perl.el
+++ b/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."))
   (case result-type
     (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-perl-command
 	      (format org-babel-perl-wrapper-method body
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index ae3f2d8..f73da65 100644
--- a/lisp/ob-python.el
+++ b/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."
   (case result-type
     (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
 			     (format
 			      (if (member "pp" result-params)
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 19e44a1..2d966b8 100644
--- a/lisp/ob-ruby.el
+++ b/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))
 	      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)
 			(member "pp" result-params))))
 	  (org-babel-comint-with-output
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index ace0b86..ce6be0b 100644
--- a/lisp/ob-scheme.el
+++ b/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))
 	      (list body (format "%S" org-babel-scheme-eoe)))))
        ;; 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
            (insert
             ;; return the value or the output