From decb2a9e5b5569ae033ec289ede43af7fa1cd53b Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 11 Oct 2005 22:06:53 +0000 Subject: [PATCH] (sh-tmp-file): Use mktemp -t. Finish support for es and rc shells. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/sh-script.el | 18 +++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 505c3a589db..1de2034918d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-10-11 Sven Joachim + + * progmodes/sh-script.el (sh-tmp-file): + Use mktemp -t. Finish support for es and rc shells. + 2005-10-11 Jay Belanger * calc/calcalg2.el (calc-integral): With an argument, compute the diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index ee184e42446..b8c425428b5 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -3392,20 +3392,16 @@ t means to return a list of all possible completions of STRING. "Insert code to setup temporary file handling. See `sh-feature'." (bash sh-append ksh88) (csh (file-name-nondirectory (buffer-file-name)) - "set tmp = `mktemp /tmp/" str ".XXXXXX`" \n + "set tmp = `mktemp -t " str ".XXXXXX`" \n "onintr exit" \n _ (and (goto-char (point-max)) (not (bolp)) ?\n) "exit:\n" "rm $tmp* >&/dev/null" > \n) - ;; The change to use mktemp here has not been tested; - ;; I don't know es syntax, so I had to guess. - ;; If you try it, or if you know es syntax and can check it, - ;; please tell me whether it needs any change. --rms. (es (file-name-nondirectory (buffer-file-name)) - > "local( signals = $signals sighup sigint; tmp = `mktemp /tmp/" str - ".XXXXXX` ) {" \n + > "local( signals = $signals sighup sigint;" \n + > "tmp = `{ mktemp -t " str ".XXXXXX } ) {" \n > "catch @ e {" \n > "rm $tmp^* >[2]/dev/null" \n "throw $e" \n @@ -3415,15 +3411,11 @@ t means to return a list of all possible completions of STRING. ?\} > \n) (ksh88 sh-modify sh 7 "EXIT") - ;; The change to use mktemp here has not been tested; - ;; I don't know rc syntax, so I had to guess. - ;; If you try it, or if you know rc syntax and can check it, - ;; please tell me whether it needs any change. --rms. (rc (file-name-nondirectory (buffer-file-name)) - > "tmp = `mktemp /tmp/" str ".XXXXXX`" \n + > "tmp = `{ mktemp -t " str ".XXXXXX }" \n "fn sigexit { rm $tmp^* >[2]/dev/null }" \n) (sh (file-name-nondirectory (buffer-file-name)) - > "TMP=`mktemp ${TMPDIR:-/tmp}/" str ".XXXXXX`" \n + > "TMP=`mktemp -t " str ".XXXXXX`" \n "trap \"rm $TMP* 2>/dev/null\" " ?0 \n)) -- 2.39.5