*** empty log message ***

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 99bbae51bb686a287e05a724caf7a2c6a4f90092..55f78900ed42cb9462d3ea88b0efe1c2cda1c19f 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-04  Gerd Moellmann  <gerd@gnu.org>
+
+       * ebrowse.c (DEFAULT_OUTFILE): Set to `BROWSE'.
+
 2000-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * ebrowse.c (PATH_LIST_SEPARATOR) [__MSDOS__ || WINDOWSNT]: Define
@@ -16,6 +20,7 @@
        (lang_names): Install it.
        (Texinfo_suffixes): New variable.
 
+>>>>>>> 2.24
 2000-04-19  Gerd Moellmann  <gerd@gnu.org>
 
        * ebrowse.c (xmalloc, xrealloc): Rewritten.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c07806050a8f7126ed81ea6b61ecc36654a0e220..44997f90f83d2eaac3bcd6423481ba465ff372ae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-04  Gerd Moellmann  <gerd@gnu.org>
 
+       * progmodes/ebrowse.el: Change file name `EBROWSE' to `BROWSE'.
+
+       * files.el (auto-mode-alist): Change `EBROWSE' to `BROWSE'.
+
        * subr.el (substitute-key-definition): Clarify documentation.
 
 2000-05-04  Milan Zamazal  <pdm@freesoft.cz>

diff --git a/src/ChangeLog b/src/ChangeLog
index 8aea17f5c144de9f2e824fa9b22e266d65308777..3178d1e267d0afa0c48ece6b795eef895e30fc2f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-04  Gerd Moellmann  <gerd@gnu.org>
+
+       * insdel.c (insert_from_buffer_1): Adjust FROM position by number
+       of inserted characters when BUF equals the current buffer, and PT
+       is in front of or equal to FROM.
+
 2000-05-03  Gerd Moellmann  <gerd@gnu.org>
 
        * xdisp.c (handle_single_display_prop): If display property value