# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 974739084 0
# Node ID b75587b124c4dc70dce26ec42e971c4832e297d5
# Parent  5c2be00ed2bad8f91f1121fb2d598fb2a25bbf77
*** empty log message ***

diff -r 5c2be00ed2ba -r b75587b124c4 etc/ONEWS
--- a/etc/ONEWS	Mon Nov 20 16:49:44 2000 +0000
+++ b/etc/ONEWS	Mon Nov 20 16:51:24 2000 +0000
@@ -2,7 +2,7 @@
 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 @@
 *** 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 -r 5c2be00ed2ba -r b75587b124c4 etc/ONEWS.2
--- a/etc/ONEWS.2	Mon Nov 20 16:49:44 2000 +0000
+++ b/etc/ONEWS.2	Mon Nov 20 16:51:24 2000 +0000
@@ -2,7 +2,7 @@
 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 -r 5c2be00ed2ba -r b75587b124c4 etc/ONEWS.3
--- a/etc/ONEWS.3	Mon Nov 20 16:49:44 2000 +0000
+++ b/etc/ONEWS.3	Mon Nov 20 16:51:24 2000 +0000
@@ -2,7 +2,7 @@
 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 -r 5c2be00ed2ba -r b75587b124c4 etc/ONEWS.4
--- a/etc/ONEWS.4	Mon Nov 20 16:49:44 2000 +0000
+++ b/etc/ONEWS.4	Mon Nov 20 16:51:24 2000 +0000
@@ -2,7 +2,7 @@
 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 -r 5c2be00ed2ba -r b75587b124c4 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 20 16:49:44 2000 +0000
+++ b/lisp/ChangeLog	Mon Nov 20 16:51:24 2000 +0000
@@ -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 -r 5c2be00ed2ba -r b75587b124c4 src/ChangeLog
--- a/src/ChangeLog	Mon Nov 20 16:49:44 2000 +0000
+++ b/src/ChangeLog	Mon Nov 20 16:51:24 2000 +0000
@@ -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.