*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b0ae238d3edb9ebacbf31e9942100b7ff72f590..f747b86b1723a7559a070f5350e95ebe4027cc29 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index bfc34a7b51fe903a6d69ab80a24e6cf18d86d935..4d162c46b9756ae6f140400389a2ae2cb75cce77 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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