From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 4 Oct 2019 12:22:41 +0000 (+0200)
Subject: Remove XEmacs compat code from idlw-shell.el
X-Git-Tag: emacs-27.0.90~1296
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=280bdc06cefa6e72e91c9da362770452d9bbbbd4;p=emacs.git

Remove XEmacs compat code from idlw-shell.el

* lisp/progmodes/idlw-shell.el (idlwave-shell-make-temp-file):
Make into obsolete alias.
(idlwave-shell-temp-file): Adjust callers.
---

diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index e4f46bf8825..dde51b355e5 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -577,38 +577,17 @@ TYPE is either 'pro' or 'rinfo', and `idlwave-shell-temp-pro-file' or
    ((eq type 'rinfo)
     (or idlwave-shell-temp-rinfo-save-file
 	(setq idlwave-shell-temp-rinfo-save-file
-	      (idlwave-shell-make-temp-file idlwave-shell-temp-pro-prefix))))
+	      (make-temp-file idlwave-shell-temp-pro-prefix))))
    ((eq type 'pro)
     (or idlwave-shell-temp-pro-file
 	(setq idlwave-shell-temp-pro-file
-	      (idlwave-shell-make-temp-file idlwave-shell-temp-pro-prefix))))
+	      (make-temp-file idlwave-shell-temp-pro-prefix))))
    (t (error "Wrong argument (idlwave-shell-temp-file): %s"
 	     (symbol-name type)))))
 
 
-(defun idlwave-shell-make-temp-file (prefix)
-  "Create a temporary file."
-  (if (featurep 'emacs)
-      (make-temp-file prefix)
-    (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)))
-		     (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))))
-
+(define-obsolete-function-alias 'idlwave-shell-make-temp-file
+  #'make-temp-file "27.1")
 
 (defvar idlwave-shell-dirstack-query "cd,current=___cur & print,___cur"
   "Command used by `idlwave-shell-resync-dirs' to query IDL for