mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-09 07:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Remove some reimplementations of cl-gensym

Browse source 
* lisp/thumbs.el: Require cl-lib at run-time too.
(thumbs-gensym-counter, thumbs-gensym):
Remove reimplementation of cl-gensym.
(thumbs-temp-file): Use cl-gensym.

* lisp/emacs-lisp/edebug.el: Require cl-lib at run-time too.
(edebug-gensym-index, edebug-gensym):
Remove reimplementation of cl-gensym.
(edebug-make-enter-wrapper, edebug-make-form-wrapper): Use cl-gensym.
This commit is contained in:
Glenn Morris 2013-07-11 13:16:19 -04:00
parent a3d4dd872c
commit 4582a01c70
3 changed files with 17 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/emacs-lisp/edebug.el
View file

@ -53,7 +53,7 @@
;;; Code:
(require 'macroexp)
(eval-when-compile (require 'cl-lib))
(require 'cl-lib)
(eval-when-compile (require 'pcase))
;;; Options
@ -263,26 +263,6 @@ An extant spec symbol is a symbol that is not a function and has a
;;; Utilities
;; Define edebug-gensym - from old cl.el
(defvar edebug-gensym-index 0
"Integer used by `edebug-gensym' to produce new names.")
(defun edebug-gensym (&optional prefix)
"Generate a fresh uninterned symbol.
There is an optional argument, PREFIX. PREFIX is the string
that begins the new name. Most people take just the default,
except when debugging needs suggest otherwise."
(if (null prefix)
(setq prefix "G"))
(let ((newsymbol nil)
(newname ""))
(while (not newsymbol)
(setq newname (concat prefix (int-to-string edebug-gensym-index)))
(setq edebug-gensym-index (+ edebug-gensym-index 1))
(if (not (intern-soft newname))
(setq newsymbol (make-symbol newname))))
newsymbol))
(defun edebug-lambda-list-keywordp (object)
"Return t if OBJECT is a lambda list keyword.
A lambda list keyword is a symbol that starts with `&'."
@ -1186,7 +1166,7 @@ Maybe clear the markers and delete the symbol's edebug property?"
;; Uses the dynamically bound vars edebug-def-name and edebug-def-args.
;; Do this after parsing since that may find a name.
(setq edebug-def-name
(or edebug-def-name edebug-old-def-name (edebug-gensym "edebug-anon")))
(or edebug-def-name edebug-old-def-name (cl-gensym "edebug-anon")))
`(edebug-enter
(quote ,edebug-def-name)
,(if edebug-inside-func
@ -1299,7 +1279,7 @@ expressions; a `progn' form will be returned enclosing these forms."
;; Set the name here if it was not set by edebug-make-enter-wrapper.
(setq edebug-def-name
(or edebug-def-name edebug-old-def-name (edebug-gensym "edebug-anon")))
(or edebug-def-name edebug-old-def-name (cl-gensym "edebug-anon")))
;; Add this def as a dependent of containing def. Buggy.
'(if (and edebug-containing-def-name