*** empty log message ***

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a3642ade96..d567624baff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-17  Gerd Moellmann  <gerd@gnu.org>
+
+        * simple.el (with-syntax-table): Save buffer explicitly instead of
+        using save-excursion.
+
 1999-11-16  Gerd Moellmann  <gerd@gnu.org>
 
         * mail/supercite.el: New maintainer.
diff --git a/src/ChangeLog b/src/ChangeLog
index c17aeb21ae1..04b09c8d4a8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -673,7 +673,6 @@
         (shrink_mini_window): Restore old window sizes only if old
         size information is valid in all windows in a window tree.
         
->>>>>>> 1.44
 1999-10-15  Gerd Moellmann  <gerd@gnu.org>
 
         * xmenu.c (set_frame_menubar): Don't call