* lisp/progmodes/idlw-shell.el (idlwave-shell-make-temp-file): Optimize

away code unneeded on any modern Emacs.

2 files changed, 24 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc16d559780..a2a8266ca3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-26  Glenn Morris  <rgm@gnu.org>
 
+        * progmodes/idlw-shell.el (idlwave-shell-make-temp-file):
+        Optimize away code unneeded on any modern Emacs.
+
         * emacs-lisp/authors.el: Move to ../admin.
 
         * emacs-lisp/ert.el (ert-summarize-tests-batch-and-exit): New.
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index e7bf3792e5f..a0683d1c409 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -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"