[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog subr.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog subr.el |
Date: |
Thu, 17 Sep 2009 20:47:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/09/17 20:47:52
Modified files:
lisp : ChangeLog subr.el
Log message:
* subr.el: Fix last change to avoid using the `unless' macro, which
breaks bootstrapping.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16193&r2=1.16194
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.654&r2=1.655
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16193
retrieving revision 1.16194
diff -u -b -r1.16193 -r1.16194
--- ChangeLog 17 Sep 2009 15:58:35 -0000 1.16193
+++ ChangeLog 17 Sep 2009 20:47:48 -0000 1.16194
@@ -1,3 +1,8 @@
+2009-09-17 Chong Yidong <address@hidden>
+
+ * subr.el: Fix last change to avoid using the `unless' macro,
+ which breaks bootstrapping.
+
2009-09-17 Stefan Monnier <address@hidden>
* subr.el (push, pop, dolist, dotimes, declare): Don't overwrite CL's
Index: subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -b -r1.654 -r1.655
--- subr.el 17 Sep 2009 15:58:38 -0000 1.654
+++ subr.el 17 Sep 2009 20:47:52 -0000 1.655
@@ -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.