(calc-gnuplot-tempfile): Don't expand against

`temporary-file-directory'; we now do that in `calc-graph-file-cache'.
(calc-temp-file-name): Use `make-temp-file'.

diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index 417e1e436a9cc8f41b08331481d8fa66fb81c36c..2a69a28883ff4bddc50b5cd9a32563c9b486d1f6 100644 (file)
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -37,7 +37,7 @@
 ;;; Graphics
 
 ;;; Note that some of the following initial values also occur in calc.el.
-(defvar calc-gnuplot-tempfile (expand-file-name "calc" temporary-file-directory))
+(defvar calc-gnuplot-tempfile "calc")
 
 (defvar calc-gnuplot-default-device "default")
 (defvar calc-gnuplot-default-output "STDOUT")
@@ -845,7 +845,7 @@
     (setq calc-graph-file-cache (nconc calc-graph-file-cache (list nil))))
   (car (or (nth (1+ num) calc-graph-file-cache)
           (setcar (nthcdr (1+ num) calc-graph-file-cache)
-                  (list (make-temp-name
+                  (list (make-temp-file
                          (concat calc-gnuplot-tempfile
                                  (if (<= num 0)
                                      (char-to-string (- ?A num))