From 2ee3d7f0aa6c29fec22e663b016a05762eb1e0d0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 22 Jun 2012 09:42:38 -0400 Subject: =?UTF-8?q?Provide=20generalized=20variables=20in=20core=20Elisp.?= =?UTF-8?q?=20*=20lisp/emacs-lisp/gv.el:=20New=20file.=20*=20lisp/subr.el?= =?UTF-8?q?=20(push,=20pop):=20Extend=20to=20generalized=20variables.=20*?= =?UTF-8?q?=20lisp/loadup.el=20(macroexp):=20Unload=20if=20preloaded=20and?= =?UTF-8?q?=20uncompiled.=20*=20lisp/emacs-lisp/cl-lib.el=20(cl-pop,=20cl-?= =?UTF-8?q?push,=20cl--set-nthcdr):=20Remove.=20*=20lisp/emacs-lisp/cl-mac?= =?UTF-8?q?s.el:=20Require=20gv.=20=20Use=20gv-define-setter,=20gv-define-?= =?UTF-8?q?simple-setter,=20and=20gv-define-expander.=20Remove=20setf-meth?= =?UTF-8?q?ods=20defined=20in=20gv.=20=20Rename=20cl-setf=20->=20setf.=20(?= =?UTF-8?q?cl-setf,=20cl-do-pop,=20cl-get-setf-method):=20Remove.=20(cl-le?= =?UTF-8?q?tf,=20cl-letf*,=20cl-define-modify-macro,=20cl-defsetf)=20(cl-d?= =?UTF-8?q?efine-setf-expander,=20cl-struct-setf-expander):=20Move=20to=20?= =?UTF-8?q?cl.el.=20(cl-remf,=20cl-shiftf,=20cl-rotatef,=20cl-callf,=20cl-?= =?UTF-8?q?callf2):=20Rewrite=20with=20gv-letplace.=20(cl-defstruct):=20Do?= =?UTF-8?q?n't=20define=20setf-method=20any=20more.=20*=20lisp/emacs-lisp/?= =?UTF-8?q?cl.el=20(flet):=20Don't=20autoload.=20(cl--letf,=20letf,=20cl--?= =?UTF-8?q?letf*,=20letf*,=20cl--gv-adapt)=20(define-setf-expander,=20defs?= =?UTF-8?q?etf,=20define-modify-macro)=20(cl-struct-setf-expander):=20Move?= =?UTF-8?q?=20from=20cl-lib.el.=20*=20lisp/emacs-lisp/syntax.el:=20*=20lis?= =?UTF-8?q?p/emacs-lisp/ewoc.el:=20*=20lisp/emacs-lisp/smie.el:=20*=20lisp?= =?UTF-8?q?/emacs-lisp/cconv.el:=20*=20lisp/emacs-lisp/timer.el:=20Rename?= =?UTF-8?q?=20cl-setf=20->=20setf,=20cl-push=20->=20push.=20(timer--time):?= =?UTF-8?q?=20Use=20gv-define-simple-setter.=20*=20lisp/emacs-lisp/macroex?= =?UTF-8?q?p.el=20(macroexp-let2):=20Rename=20from=20macroexp-let=C2=B2=20?= =?UTF-8?q?to=20avoid=20coding-system=20problems=20in=20subr.el.=20=20Adju?= =?UTF-8?q?st=20all=20users.=20(macroexp--maxsize,=20macroexp-small-p):=20?= =?UTF-8?q?New=20functions.=20*=20lisp/emacs-lisp/bytecomp.el=20(byte-comp?= =?UTF-8?q?ile-file):=20Don't=20use=20cl-letf.=20*=20lisp/scroll-bar.el=20?= =?UTF-8?q?(scroll-bar-mode):=20*=20lisp/simple.el=20(auto-fill-mode,=20ov?= =?UTF-8?q?erwrite-mode,=20binary-overwrite-mode)=20(normal-erase-is-backs?= =?UTF-8?q?pace-mode):=20Don't=20use=20the=20`eq'=20place.=20*=20lisp/winn?= =?UTF-8?q?er.el=20(winner-configuration,=20winner-make-point-alist)=20(wi?= =?UTF-8?q?nner-set-conf,=20winner-get-point,=20winner-set):=20Don't=20abu?= =?UTF-8?q?se=20letf.=20*=20lisp/files.el=20(locate-file-completion-table)?= =?UTF-8?q?:=20Avoid=20list*.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: debbugs:11657 --- lisp/emacs-lisp/cconv.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lisp/emacs-lisp/cconv.el') diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 6f411bdeb30..5a1d6265848 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -346,13 +346,13 @@ places where they originally did not directly appear." (if (not (eq (cadr mapping) 'apply-partially)) mapping (cl-assert (eq (car mapping) (nth 2 mapping))) - (cl-list* (car mapping) - 'apply-partially - (car mapping) - (mapcar (lambda (arg) - (if (eq var arg) - closedsym arg)) - (nthcdr 3 mapping))))) + `(,(car mapping) + apply-partially + ,(car mapping) + ,@(mapcar (lambda (arg) + (if (eq var arg) + closedsym arg)) + (nthcdr 3 mapping))))) new-env)) (setq new-extend (remq var new-extend)) (push closedsym new-extend) @@ -559,8 +559,8 @@ FORM is the parent form that binds this var." (when (car y) (setcar x t) (setq free t)) (setq x (cdr x) y (cdr y))) (when free - (cl-push (caar env) (cdr freevars)) - (cl-setf (nth 3 (car env)) t)) + (push (caar env) (cdr freevars)) + (setf (nth 3 (car env)) t)) (setq env (cdr env) envcopy (cdr envcopy)))))) (defun cconv-analyse-form (form env) @@ -610,7 +610,7 @@ and updates the data stored in ENV." ;; it is a mutated variable. (while forms (let ((v (assq (car forms) env))) ; v = non nil if visible - (when v (cl-setf (nth 2 v) t))) + (when v (setf (nth 2 v) t))) (cconv-analyse-form (cadr forms) env) (setq forms (cddr forms)))) @@ -656,7 +656,7 @@ and updates the data stored in ENV." ;; lambda candidate list. (let ((fdata (and (symbolp fun) (assq fun env)))) (if fdata - (cl-setf (nth 4 fdata) t) + (setf (nth 4 fdata) t) (cconv-analyse-form fun env))) (dolist (form args) (cconv-analyse-form form env))) @@ -676,7 +676,7 @@ and updates the data stored in ENV." ((pred symbolp) (let ((dv (assq form env))) ; dv = declared and visible (when dv - (cl-setf (nth 1 dv) t)))))) + (setf (nth 1 dv) t)))))) (provide 'cconv) ;;; cconv.el ends here -- cgit v1.2.1