Use cl-with-gensyms in a few more cases

* doc/misc/cl.texi (Macro Bindings):
* lisp/emacs-lisp/comp.el (comp--with-sp):
* lisp/emacs-lisp/subr-x.el (with-buffer-unmodified-if-unchanged):
* lisp/eshell/em-extpipe.el (eshell-extpipe--or-with-catch):
* lisp/international/mule-cmds.el (with-locale-environment):
* lisp/kmacro.el (kmacro-menu--marks-exist-p):
* test/lisp/emacs-lisp/cl-extra-tests.el (cl-lib-test-remprop):
* test/lisp/emacs-lisp/edebug-tests.el (edebug-tests-deduplicate):
* test/lisp/emacs-lisp/ert-tests.el (ert-test-special-operator-p):
* test/lisp/kmacro-tests.el (kmacro-tests-should-insert)
(kmacro-tests-should-match-message):
* test/lisp/replace-tests.el (replace-tests-with-undo): Use
cl-with-gensyms instead of bare gensym call.

5 files changed, 7 insertions, 9 deletions

diff --git a/test/lisp/emacs-lisp/cl-extra-tests.el b/test/lisp/emacs-lisp/cl-extra-tests.el
index 41753194c1b..20d1e532a6f 100644
--- a/test/lisp/emacs-lisp/cl-extra-tests.el
+++ b/test/lisp/emacs-lisp/cl-extra-tests.el
@@ -23,7 +23,7 @@
 (require 'ert)
 
 (ert-deftest cl-lib-test-remprop ()
-  (let ((x (cl-gensym)))
+  (cl-with-gensyms (x)
     (should (equal (symbol-plist x) '()))
     ;; Remove nonexistent property on empty plist.
     (cl-remprop x 'b)
diff --git a/test/lisp/emacs-lisp/edebug-tests.el b/test/lisp/emacs-lisp/edebug-tests.el
index 02eadd34c8d..7daacea7925 100644
--- a/test/lisp/emacs-lisp/edebug-tests.el
+++ b/test/lisp/emacs-lisp/edebug-tests.el
@@ -321,8 +321,7 @@ NAME should be a string and NAMES-AND-NUMBERS an alist which can
 be used by this macro to retain state.  If NAME for example is
 \"symbol\" then the first and subsequent uses of this macro will
 evaluate to \"symbol\", \"symbol-1\", \"symbol-2\", etc."
-  (let ((g-name (gensym))
-        (g-duplicate (gensym)))
+  (cl-with-gensyms (g-name g-duplicate)
     `(let* ((,g-name ,name)
             (,g-duplicate (assoc ,g-name ,names-and-numbers)))
        (if (null ,g-duplicate)
diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el
index d4370366b39..aec2c92ba81 100644
--- a/test/lisp/emacs-lisp/ert-tests.el
+++ b/test/lisp/emacs-lisp/ert-tests.el
@@ -617,7 +617,7 @@ This macro is used to test if macroexpansion in `should' works."
   (should (ert--special-operator-p 'if))
   (should-not (ert--special-operator-p 'car))
   (should-not (ert--special-operator-p 'ert--special-operator-p))
-  (let ((b (cl-gensym)))
+  (cl-with-gensyms (b)
     (should-not (ert--special-operator-p b))
     (fset b 'if)
     (should (ert--special-operator-p b))))
diff --git a/test/lisp/kmacro-tests.el b/test/lisp/kmacro-tests.el
index e4641cfc4e5..86adcbf3a30 100644
--- a/test/lisp/kmacro-tests.el
+++ b/test/lisp/kmacro-tests.el
@@ -24,6 +24,7 @@
 ;;; Code:
 
 (require 'kmacro)
+(require 'cl-lib)
 (require 'seq)
 (require 'ert)
 (require 'ert-x)
@@ -157,8 +158,7 @@ Execute BODY, then check that the string VALUE was inserted
 into the current buffer at point."
   (declare (debug (stringp body))
            (indent 1))
-  (let ((g-p (cl-gensym))
-        (g-bsize (cl-gensym)))
+  (cl-with-gensyms (g-p g-bsize)
     `(let ((,g-p (point))
            (,g-bsize (buffer-size)))
        ,@body
@@ -172,7 +172,7 @@ VALUE and any text written to *Messages* during the execution,
 cause the current test to fail."
   (declare (debug (form body))
            (indent 1))
-  (let ((g-captured-messages (cl-gensym)))
+  (cl-with-gensyms (g-captured-messages)
     `(ert-with-message-capture ,g-captured-messages
        ,@body
        (should (string-match-p ,value ,g-captured-messages)))))
diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el
index 51f7ddb25f0..fd3ecda2b72 100644
--- a/test/lisp/replace-tests.el
+++ b/test/lisp/replace-tests.el
@@ -528,8 +528,7 @@ then replace 3 matches of FROM with TO, and undo the last replacement.
 
 Return the last evalled form in BODY."
   (declare (indent 5) (debug (stringp stringp stringp form characterp body)))
-  (let ((text (gensym "text"))
-        (count (gensym "count")))
+  (cl-with-gensyms (text count)
     `(let* ((,text ,input)
             (,count 0)
             (inhibit-message t))