*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7ef0c44eeeba4c0d16eafb74fd9d5bf9a1f231e..9c9b19b2ea459e11b65de274d8584fab7dd70155 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-02-25  Sam Steingold  <sds@goems.com>
+
+       * emacs-lisp/cl-indent.el (toplvel): Indent `pprint-logical-block'
+       properly.
+       
+2000-02-25  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+
+       * mail/rmail.el (rmail-resend): Verify buffer is really Rmail.
+
 2000-02-25  Gerd Moellmann  <gerd@gnu.org>
 
        * emacs-lisp/helper.el (Helper-describe-mode): Make buffer

diff --git a/src/ChangeLog b/src/ChangeLog
index 3acdb35708868a2f65f1f8b6f8e612d5dd6b6188..c979d746484369686bbe1d77106bf7aa48eda31c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2000-02-25  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
+       
+       * fileio.c (Ffile_symlink_p): If result starts with a `/'
+       and contains a `:', prepend `/:'.
+
+       * window.c (select_window_1): If selected_window is nil,
+       don't "swap out" the buffer's point.
+       (Fset_window_configuration): Set selected_window to nil
+       before calling Fselect_window.
+       (unshow_buffer): Don't set point in buffer from window's point
+       if another more recently selected window also shows the buffer.
+
 2000-02-25  Gerd Moellmann  <gerd@gnu.org>
 
        * keyboard.c (recursive_edit_1): Cancel busy-cursor.