From: Kim F. Storm <storm@cua.dk>
Date: Wed, 18 Apr 2007 09:05:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.99~183
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9efe0fb661d5bd121fb4ea9b49051472fb21a5b2;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f562a8aad1..9744808949f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -23,8 +23,8 @@
 2007-04-17  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
 	* textmodes/bibtex.el (bibtex-include-OPTkey)
-	(bibtex-user-optional-fields, bibtex-entry-field-alist): Fix
-	defcustom.
+	(bibtex-user-optional-fields, bibtex-entry-field-alist):
+	Fix defcustom.
 
 2007-04-17  Glenn Morris  <rgm@gnu.org>
 
@@ -94,8 +94,7 @@
 
 2007-04-13  Chong Yidong  <cyd@stupidchicken.com>
 
-	* progmodes/compile.el (compilation-start): Revert 2007-03-25
-	change.
+	* progmodes/compile.el (compilation-start): Revert 2007-03-25 change.
 
 	* files.el: Ditto.
 
@@ -163,8 +162,8 @@
 
 2007-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-	* desktop.el (desktop-save, desktop-create-buffer): Replace mapcar with
-	dolist.
+	* desktop.el (desktop-save, desktop-create-buffer): Replace mapcar
+	with dolist.
 	(after-init-hook): Don't quote lambda.
 	(desktop-first-buffer): Don't wrap it in eval-when-compile.
 	(desktop-internal-v2s): Remove unused var `el'.
@@ -813,7 +812,6 @@
 	* isearchb.el (isearchb-follow-char):
 	* subr.el (def-edebug-spec): Fix typo in docstring.
 
->>>>>>> 1.10924
 2007-03-19  Richard Stallman  <rms@gnu.org>
 
 	* files.el (default-directory): Mark safe.