*** empty log message ***

6 files changed, 21 insertions, 5 deletions

diff --git a/etc/ONEWS b/etc/ONEWS
index 17909d0022c..c99afb60793 100644
--- a/etc/ONEWS
+++ b/etc/ONEWS
@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  1992.
 Copyright (C) 1995 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-For older news, see the file NEWS.4.
+For older news, see the file ONEWS.4.
 
 * Editing Changes in Emacs 19.30.
 
@@ -254,7 +254,7 @@ your working file with the latest version from the master.
 *** RCS customization.
 
 There is a new variable vc-consult-headers.  If it is t (the default),
-VC searches for RCS headers in working files (like `$Id: ONEWS,v 1.2 2000/08/17 15:19:41 gerd Exp $') and
+VC searches for RCS headers in working files (like `$Id: ONEWS,v 1.3 2000/11/02 13:34:50 gerd Exp $') and
 determines the state of the file from them, not from the master file.
 This is fast and more reliable when you use branches.  (The variable
 was already present in Emacs 19.29, but didn't get mentioned in the
diff --git a/etc/ONEWS.2 b/etc/ONEWS.2
index df85cfd3f93..f0b5dad0b01 100644
--- a/etc/ONEWS.2
+++ b/etc/ONEWS.2
@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
 Copyright (C) 1986 Richard M. Stallman.
 See the end for copying conditions.
 
-For older news, see the file NEWS.1.
+For older news, see the file ONEWS.1.
 
 Changes in Emacs 17
 
diff --git a/etc/ONEWS.3 b/etc/ONEWS.3
index b8c13f167fc..02d4cb9f3fa 100644
--- a/etc/ONEWS.3
+++ b/etc/ONEWS.3
@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
 Copyright (C) 1988 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-For older news, see the file NEWS.2.
+For older news, see the file ONEWS.2.
 
 Changes in version 18.52.
 
diff --git a/etc/ONEWS.4 b/etc/ONEWS.4
index 9c779c7a6ca..115e07ccd6c 100644
--- a/etc/ONEWS.4
+++ b/etc/ONEWS.4
@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  1992.
 Copyright (C) 1992 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-For older news, see the file NEWS.3.
+For older news, see the file ONEWS.3.
 
 Changes in version 18.58.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a6924a19f26..929be257503 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-20  Gerd Moellmann  <gerd@gnu.org>
+
+        * font-lock.el (java-keywords): Add MATCH-HIGHLIGHT part for
+        javadoc tags.
+        
 2000-11-20  Andre Spiegel  <spiegel@gnu.org>
 
         * vc.el, vc-hooks.el: Undo prev change (moved functions back to
diff --git a/src/ChangeLog b/src/ChangeLog
index e5ac53e1da2..e80ec2afb28 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-20  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (scroll_bar_windows, scroll_bar_windows_size): New
+        variables.
+        (x_send_scroll_bar_event): Store the window in scroll_bar_windows
+        and store an index in the XClientMessageEvent.  Storing a
+        Lisp_Object or pointer can fail on a 64 bit system, since X only
+        transfers 32 bits.
+        (x_scroll_bar_to_input_event): Get the window from
+        scroll_bar_windows.
+        
 2000-11-20  Dave Love  <fx@gnu.org>
 
         * Makefile.in (LIBX): Reorder for -lX11 after -lXpm.