Prefer make-temp-name in make-mode.el

* lisp/progmodes/make-mode.el
(makefile-generate-temporary-filename): Make obsolete in favor of
'make-temp-name'.  Simplify.
(makefile-save-temporary): Don't use above obsolete function.

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 92d8a739a5f50a65033e3dc44a5ff9e48d1a0f2a..413e2a42d65e7f4b550108dabf1c1ba0bd596d6a 100644 (file)
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -88,6 +88,8 @@
   (require 'dabbrev)
   (require 'add-log))
 
+(require 'subr-x) ; `string-limit'
+
 ;;; ------------------------------------------------------------
 ;;; Configurable stuff
 ;;; ------------------------------------------------------------
@@ -1539,24 +1541,9 @@ dependency in the makefile."
 
 (defun makefile-save-temporary ()
   "Create a temporary file from the current makefile buffer."
-  (let ((filename (makefile-generate-temporary-filename)))
+  (let ((filename (make-temp-name "mktmp.")))
     (write-region (point-min) (point-max) filename nil 0)
-    filename))                         ; return the filename
-
-(defun makefile-generate-temporary-filename ()
-  "Create a filename suitable for use in `makefile-save-temporary'.
-Be careful to allow brain-dead file systems (DOS, SYSV ...) to cope
-with the generated name!"
-  (let ((my-name (user-login-name))
-       (my-uid (int-to-string (user-uid))))
-    (concat "mktmp"
-         (if (> (length my-name) 3)
-             (substring my-name 0 3)
-           my-name)
-         "."
-         (if (> (length my-uid) 3)
-             (substring my-uid 0 3)
-           my-uid))))
+    filename))
 
 (defun makefile-query-targets (filename target-table prereq-list)
   "Fill the up-to-date overview buffer.
@@ -1823,6 +1810,13 @@ If it isn't in one, return nil."
        (setq found (replace-regexp-in-string "\\`[ \t]+" "" found)))
       found)))
 
+(defun makefile-generate-temporary-filename ()
+  "Create a filename suitable for use in `makefile-save-temporary'."
+  (declare (obsolete make-temp-name "29.1"))
+  (format "mktmp%s.%s"
+          (string-limit (user-login-name) 3)
+          (string-limit (int-to-string (user-uid)) 3)))
+
 (provide 'make-mode)
 
 ;;; make-mode.el ends here