1 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9407c62075f..09e6c962f19 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-06  Glenn Morris  <rgm@gnu.org>
+
+        * vc/emerge.el (emerge-eval-in-buffer): Remove, and replace all uses
+        with with-current-buffer.
+        (diff, template): Give dynamic local variables a prefix.
+        (emerge-line-numbers): Rename local `diff' to emerge-line-diff.
+        (emerge-line-number-in-buf): Update for above name change.
+        (emerge-combine-versions-internal): Rename local `template' to
+        emerge-combine-template.
+        (emerge-combine-versions-edit): Update for above name change.
+
 2010-11-06  Ralf Angeli  <angeli@caeruleus.net>
 
         * textmodes/reftex-cite.el