*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fc69b5ae52bf0315d84e0acaef7da4e2f582df4..5c9792838757f5224f2d95a7e1599e7208cac28a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,6 +13,9 @@
 
 2000-12-11  Gerd Moellmann  <gerd@gnu.org>
 
+       * simple.el (kill-new): Don't try to setcar kill-ring if it is
+       nil.
+
        * cus-edit.el (custom-save-variables, custom-save-faces): 
        Comment fix.
 

diff --git a/man/frames.texi b/man/frames.texi
index 500340c5a9ed9db2ded7b0ab53cde183bf3ae66d..58d277d99afd7896c480fd7f2c02d115c1b6091c 100644 (file)
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -690,9 +690,10 @@ the level where you click up to the top of the window.  @kbd{Mouse-3}
 down to the level where you click.  By clicking repeatedly in the same
 place, you can scroll by the same distance over and over.
 
-  Aside from scrolling, you can also click @kbd{C-Mouse-2} in the scroll
-bar to split a window vertically.  The split occurs on the line where
-you click.
+  If you are using Emacs own implementation of scroll bars, as opposed
+to scroll bars from an X toolkit, you can also click @kbd{C-Mouse-2} in
+the scroll bar to split a window vertically.  The split occurs on the
+line where you click.
 
 @findex scroll-bar-mode
 @vindex scroll-bar-mode

diff --git a/src/ChangeLog b/src/ChangeLog
index 951205e8978d8f9008e4ed5fe3c23a6430fc4aad..f89e0a3c8a702a78864363e61b6feb5469c09f88 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-11  Gerd Moellmann  <gerd@gnu.org>
 
+       * keymap.c (Fkey_description): If KEYS is an empty key sequence,
+       return an empty string.
+
        * xdisp.c (try_cursor_movement): Check update_mode_lines instead
        of the window's update_mode_line flag, since the former is set by
        force-mode-line-update, not the latter.  This makes