branch: elpa/magit commit dfbc8fb91367dd6c12072c4cddabb47470c23f8c Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
Use gensym instead of obsolete cl-gensym --- lisp/magit-base.el | 2 +- lisp/magit-ediff.el | 4 ++-- lisp/magit-git.el | 8 ++++---- lisp/magit-mode.el | 2 +- lisp/magit-section.el | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lisp/magit-base.el b/lisp/magit-base.el index 91b592651e2..7007a6488f9 100644 --- a/lisp/magit-base.el +++ b/lisp/magit-base.el @@ -908,7 +908,7 @@ data, starting with 1 and incrementing by 1 for each symbol. If the last match was against a string, then that has to be provided as STRING." (declare (indent 2) (debug (listp form body))) - (let ((s (cl-gensym "string")) + (let ((s (gensym "string")) (i 0)) `(let ((,s ,string)) (let ,(save-match-data diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el index 650268d80dc..8c8d026c1b3 100644 --- a/lisp/magit-ediff.el +++ b/lisp/magit-ediff.el @@ -181,8 +181,8 @@ is put in FILE." (setq get (nreverse get)) (setq make (nreverse make)) (setq kill (nreverse kill)) - (let ((mconf (cl-gensym "conf")) - (mfile (cl-gensym "file"))) + (let ((mconf (gensym "conf")) + (mfile (gensym "file"))) `(magit-with-toplevel (let ((,mconf (current-window-configuration)) (,mfile ,file) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index 76b976dc6d6..334d2550a50 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -252,8 +252,8 @@ See info node `(magit)Debugging Tools' for more information." (defmacro magit--with-refresh-cache (key &rest body) (declare (indent 1) (debug (form body))) - (let ((k (cl-gensym)) - (hit (cl-gensym))) + (let ((k (gensym)) + (hit (gensym))) `(if magit--refresh-cache (let ((,k ,key)) (if-let ((,hit (assoc ,k (cdr magit--refresh-cache)))) @@ -299,7 +299,7 @@ propagated by `with-temp-buffer', so we explicitly ensure that happens, so that processes will be invoked consistently. BODY is as for that macro." (declare (indent 0) (debug (body))) - (let ((p (cl-gensym))) + (let ((p (gensym))) `(let ((,p process-environment)) (with-temp-buffer (setq-local process-environment ,p) @@ -2402,7 +2402,7 @@ and this option only controls what face is used.") (defmacro magit-with-temp-index (tree arg &rest body) (declare (indent 2) (debug (form form body))) - (let ((file (cl-gensym "file"))) + (let ((file (gensym "file"))) `(let ((magit--refresh-cache nil) (,file (magit-convert-filename-for-git (make-temp-name diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el index 5f930ee736f..572381ba1b2 100644 --- a/lisp/magit-mode.el +++ b/lisp/magit-mode.el @@ -1426,7 +1426,7 @@ repositories." (defmacro magit--with-repository-local-cache (key &rest body) (declare (indent 1) (debug (form body))) - (let ((k (cl-gensym))) + (let ((k (gensym))) `(let ((,k ,key)) (if-let ((kv (magit-repository-local-exists-p ,k))) (cdr kv) diff --git a/lisp/magit-section.el b/lisp/magit-section.el index e5a43d6eeaf..78347bdb100 100644 --- a/lisp/magit-section.el +++ b/lisp/magit-section.el @@ -1392,7 +1392,7 @@ anything this time around. (pcase-let* ((bind (and (symbolp (car args)) (pop args))) (`((,class ,value ,hide . ,args) . ,body) args) - (obj (cl-gensym "section"))) + (obj (gensym "section"))) `(let* ((,obj (magit-insert-section--create ,(if (eq (car-safe class) 'eval) (cadr class) `',class) ,value ,hide ,@args)) @@ -1574,9 +1574,9 @@ If the section is expanded when it is created, then this is like `progn'. Otherwise BODY isn't evaluated until the section is explicitly expanded." (declare (indent 0)) - (let ((f (cl-gensym)) - (s (cl-gensym)) - (l (cl-gensym))) + (let ((f (gensym)) + (s (gensym)) + (l (gensym))) `(let ((,f (lambda () ,@body))) (if (oref magit-insert-section--current hidden) (oset magit-insert-section--current washer