[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  07/04/18 09:05:11

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11002
retrieving revision 1.11003
diff -u -b -r1.11002 -r1.11003
--- ChangeLog   18 Apr 2007 06:44:01 -0000      1.11002
+++ ChangeLog   18 Apr 2007 09:05:11 -0000      1.11003
@@ -23,8 +23,8 @@
 2007-04-17  Roland Winkler  <address@hidden>
 
        * 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  <address@hidden>
 
@@ -94,8 +94,7 @@
 
 2007-04-13  Chong Yidong  <address@hidden>
 
-       * 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  <address@hidden>
 
-       * 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  <address@hidden>
 
        * files.el (default-directory): Mark safe.