Mercurial > emacs
changeset 105068:b97679d5a9af
* subr.el: Fix last change to avoid using the `unless' macro, which
breaks bootstrapping.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 17 Sep 2009 20:47:48 +0000 |
| parents | 7cd310ca08cd |
| children | 4cbb223d0b1c |
| files | lisp/ChangeLog lisp/subr.el |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 17 18:06:57 2009 +0000 +++ b/lisp/ChangeLog Thu Sep 17 20:47:48 2009 +0000 @@ -1,3 +1,8 @@ +2009-09-17 Chong Yidong <cyd@stupidchicken.com> + + * subr.el: Fix last change to avoid using the `unless' macro, + which breaks bootstrapping. + 2009-09-17 Stefan Monnier <monnier@iro.umontreal.ca> * subr.el (push, pop, dolist, dotimes, declare): Don't overwrite CL's
--- a/lisp/subr.el Thu Sep 17 18:06:57 2009 +0000 +++ b/lisp/subr.el Thu Sep 17 20:47:48 2009 +0000 @@ -119,7 +119,8 @@ ;; depend on backquote.el. (list 'function (cons 'lambda cdr))) -(unless (featurep 'cl) +(if (null (featurep 'cl)) + (progn ;; If we reload subr.el after having loaded CL, be careful not to ;; overwrite CL's extended definition of `dolist', `dotimes', ;; `declare', `push' and `pop'. @@ -139,7 +140,8 @@ (declare (debug (sexp))) (list 'car (list 'prog1 listname - (list 'setq listname (list 'cdr listname)))))) + (list 'setq listname (list 'cdr listname))))) +)) (defmacro when (cond &rest body) "If COND yields non-nil, do BODY, else return nil. @@ -159,7 +161,8 @@ (declare (indent 1) (debug t)) (cons 'if (cons cond (cons nil body)))) -(unless (featurep 'cl) +(if (null (featurep 'cl)) + (progn ;; If we reload subr.el after having loaded CL, be careful not to ;; overwrite CL's extended definition of `dolist', `dotimes', ;; `declare', `push' and `pop'. @@ -214,7 +217,8 @@ "Do not evaluate any arguments and return nil. Treated as a declaration when used at the right place in a `defmacro' form. \(See Info anchor `(elisp)Definition of declare'.)" - nil)) + nil) +)) (defmacro ignore-errors (&rest body) "Execute BODY; if an error occurs, return nil.