[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog subr.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog subr.el |
Date: |
Thu, 17 Sep 2009 15:58:39 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/09/17 15:58:38
Modified files:
lisp : ChangeLog subr.el
Log message:
(push, pop, dolist, dotimes, declare): Don't overwrite CL's
extended definitions, in case we reload subr.el after having
loaded CL.
(eval-next-after-load): Mark as obsolete.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16192&r2=1.16193
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.653&r2=1.654
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16192
retrieving revision 1.16193
diff -u -b -r1.16192 -r1.16193
--- ChangeLog 17 Sep 2009 10:31:15 -0000 1.16192
+++ ChangeLog 17 Sep 2009 15:58:35 -0000 1.16193
@@ -1,3 +1,10 @@
+2009-09-17 Stefan Monnier <address@hidden>
+
+ * subr.el (push, pop, dolist, dotimes, declare): Don't overwrite CL's
+ extended definitions, in case we reload subr.el after having
+ loaded CL.
+ (eval-next-after-load): Mark as obsolete.
+
2009-09-17 Juri Linkov <address@hidden>
* menu-bar.el (menu-bar-search-menu, menu-bar-edit-menu)
Index: subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -b -r1.653 -r1.654
--- subr.el 15 Sep 2009 03:39:44 -0000 1.653
+++ subr.el 17 Sep 2009 15:58:38 -0000 1.654
@@ -119,6 +119,10 @@
;; depend on backquote.el.
(list 'function (cons 'lambda cdr)))
+(unless (featurep 'cl)
+ ;; 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'.
(defmacro push (newelt listname)
"Add NEWELT to the list stored in the symbol LISTNAME.
This is equivalent to (setq LISTNAME (cons NEWELT LISTNAME)).
@@ -135,7 +139,7 @@
(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.
@@ -155,6 +159,10 @@
(declare (indent 1) (debug t))
(cons 'if (cons cond (cons nil body))))
+(unless (featurep 'cl)
+ ;; 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'.
(defvar --dolist-tail-- nil
"Temporary variable used in `dolist' expansion.")
@@ -206,7 +214,7 @@
"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.
@@ -726,8 +734,8 @@
;;;; The global keymap tree.
-;;; global-map, esc-map, and ctl-x-map have their values set up in
-;;; keymap.c; we just give them docstrings here.
+;; global-map, esc-map, and ctl-x-map have their values set up in
+;; keymap.c; we just give them docstrings here.
(defvar global-map nil
"Default global keymap mapping Emacs keyboard input into commands.
@@ -1702,6 +1710,7 @@
This makes or adds to an entry on `after-load-alist'.
FILE should be the name of a library, with no directory name."
(eval-after-load file (read)))
+(make-obsolete 'eval-next-after-load `eval-after-load "23.2")
;;;; Process stuff.
- [Emacs-diffs] emacs/lisp ChangeLog subr.el,
Stefan Monnier <=