[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 6f42782a57 2/5: Prefer make-temp-name in make-mode.el
From: |
Stefan Kangas |
Subject: |
master 6f42782a57 2/5: Prefer make-temp-name in make-mode.el |
Date: |
Fri, 28 Oct 2022 16:29:35 -0400 (EDT) |
branch: master
commit 6f42782a57c6a37e1f30535dde829053f1005389
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
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.
---
lisp/progmodes/make-mode.el | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 92d8a739a5..413e2a42d6 100644
--- 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