diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-09-17 20:47:48 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-09-17 20:47:48 +0000 |
| commit | a69c67e84f2896613eb4e6848ef844e0a312f8c7 (patch) | |
| tree | a7059fbe5df42884431e119a60dbd00a76f467e6 /lisp | |
| parent | e227ba05ec2f6c6868a95a1323ab71f84568badc (diff) | |
| download | emacs-a69c67e84f2896613eb4e6848ef844e0a312f8c7.tar.gz | |
* subr.el: Fix last change to avoid using the `unless' macro, which
breaks bootstrapping.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/subr.el | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4cf3ed85457..d7882fc348a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/subr.el b/lisp/subr.el index 00b41752528..e8d7072081e 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -119,7 +119,8 @@ BODY should be a list of Lisp expressions. ;; 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 @@ change the list." (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 @@ value of last one, or nil if there are none. (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 @@ the return value (nil if RESULT is omitted). "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. |