From: Kim F. Storm <storm@cua.dk>
Date: Thu, 21 Sep 2006 08:42:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~416
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e09836ebf6ee02ff7efd29cf93c9c4672a9b127;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d79a8d9662..31c4ccab181 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-21  Kim F. Storm  <storm@cua.dk>
+
+	* emacs-lisp/cl.el (pushnew-internal): Remove defvar.
+	(pushnew): Fix last change.
+
 2006-09-21  Kenichi Handa  <handa@m17n.org>
 
 	* language/european.el ("Latin-1"): Add windows-1252 to
@@ -57,7 +62,6 @@
 	* menu-bar.el (clipboard-yank): Bomb out in interactive use if
 	buffer is read-only.
 
->>>>>>> 1.10102
 2006-09-18  Ken Manheimer  <ken.manheimer@gmail.com>
 
 	* allout.el (allout-unprotected): Let inhibit-read-only only when