Merge from origin/emacs-24

[gnu-emacs] / lisp / progmodes / idlw-shell.el

diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 5d43edc2fc885f16d942a93a3ee4e944936f19de..40c40eef3020a1b26a1ff1336b914af4e5bf2128 100644 (file)
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -1,6 +1,6 @@
 ;; idlw-shell.el --- run IDL as an inferior process of Emacs.
 
-;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@astro.uva.nl>
@@ -590,27 +590,28 @@ TYPE is either 'pro' or 'rinfo', and `idlwave-shell-temp-pro-file' or
 
 (defun idlwave-shell-make-temp-file (prefix)
   "Create a temporary file."
-  ; Hard coded make-temp-file for Emacs<21
-  (if (fboundp 'make-temp-file)
+  (if (featurep 'emacs)
       (make-temp-file prefix)
-    (let (file
-         (temp-file-dir (if (boundp 'temporary-file-directory)
-                            temporary-file-directory
-                          "/tmp")))
-      (while (condition-case ()
-                (progn
-                  (setq file
-                        (make-temp-name
-                         (expand-file-name prefix temp-file-dir)))
-                   (if (featurep 'xemacs)
-                      (write-region "" nil file nil 'silent nil)
-                    (write-region "" nil file nil 'silent nil 'excl))
-                  nil)
-              (file-already-exists t))
-       ;; the file was somehow created by someone else between
-       ;; `make-temp-name' and `write-region', let's try again.
-       nil)
-      file)))
+    (if (fboundp 'make-temp-file)
+       (make-temp-file prefix)
+      (let (file
+           (temp-file-dir (if (boundp 'temporary-file-directory)
+                              temporary-file-directory
+                            "/tmp")))
+       (while (condition-case ()
+                  (progn
+                    (setq file
+                          (make-temp-name
+                           (expand-file-name prefix temp-file-dir)))
+                    (if (featurep 'xemacs)
+                        (write-region "" nil file nil 'silent nil)
+                      (write-region "" nil file nil 'silent nil 'excl))
+                    nil)
+                (file-already-exists t))
+         ;; the file was somehow created by someone else between
+         ;; `make-temp-name' and `write-region', let's try again.
+         nil)
+       file))))
 
 
 (defvar idlwave-shell-dirstack-query "cd,current=___cur & print,___cur"