# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 977927884 0
# Node ID 68280f3ea5a210f70da521b3cbba48a1b2a9d2d1
# Parent  c088e2f67eb921af173c68a6b01a2ce1d316efd9
*** empty log message ***

diff -r c088e2f67eb9 -r 68280f3ea5a2 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Dec 27 14:34:53 2000 +0000
+++ b/lisp/ChangeLog	Wed Dec 27 14:38:04 2000 +0000
@@ -1,3 +1,13 @@
+2000-12-27  Gerd Moellmann  <gerd@gnu.org>
+
+	* version.el (emacs-version): Print X scroll bar information.
+
+	* scroll-bar.el (toplevel): Check for x-toolkit-scroll-bars
+	instead of x-toolkit-scroll-bars-p.
+
+	* loadup.el (toplevel): Check for x-toolkit-scroll-bars instead
+	of x-toolkit-scroll-bars-p.
+
 2000-12-27  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* ffap.el (ffap-bindings): Make interactive and add an autoload
@@ -10,17 +20,18 @@
 	characters to 'term-send-raw in term-raw-map.
 
 2000-12-25  Michael Kifer  <kifer@cs.sunysb.edu>
-	* viper-init (viper-restore-cursor-type): added condition-case
+	
+	* viper-init (viper-restore-cursor-type): Added condition-case
 	guard.
 	
-	* ediff-init.el (ediff-quit-hook,ediff-suspend-hook): changed
+	* ediff-init.el (ediff-quit-hook,ediff-suspend-hook): Changed
 	initialization; use add-hook.
-	(ediff-file-remote-p): use file-local-copy.
+	(ediff-file-remote-p): Use file-local-copy.
 	
-	* ediff-ptch.el (ediff-prompt-for-patch-buffer): improved defaults.
+	* ediff-ptch.el (ediff-prompt-for-patch-buffer): Improved defaults.
 	
-	* ediff.el (ediff-patch-buffer): bug fix.
-	(ediff-revision): allow selection of the file at the prompt.
+	* ediff.el (ediff-patch-buffer): Bug fix.
+	(ediff-revision): Allow selection of the file at the prompt.
 	
 2000-12-23  Stefan Monnier  <monnier@cs.yale.edu>
 
diff -r c088e2f67eb9 -r 68280f3ea5a2 src/ChangeLog
--- a/src/ChangeLog	Wed Dec 27 14:34:53 2000 +0000
+++ b/src/ChangeLog	Wed Dec 27 14:38:04 2000 +0000
@@ -1,5 +1,13 @@
 2000-12-27  Gerd Moellmann  <gerd@gnu.org>
 
+	* xterm.c (syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
+	instead of x-toolkit-scroll-bars-p.
+	(Vx_toolkit_scroll_bars): Renamed from x_toolkit_scroll_bars_p.
+
+	* w32term.c (syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
+	instead of x-toolkit-scroll-bars-p.
+	(Vx_toolkit_scroll_bars): Renamed from x_toolkit_scroll_bars_p.
+	
 	* dispnew.c (struct redisplay_history) [GLYPH_DEBUG]: New.
 	(REDISPLAY_HISTORY_SIZE) [GLYPH_DEBUG]: New macro.
 	(redisplay_history, history_idx, history_tick) [GLYPH_DEBUG]: New