From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 30 Dec 2006 15:23:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.93~348
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0fb7324a4d1327224aae0b4364e9194ae36dac86;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51f3887f1c8..d592f1624f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* scroll-bar.el (previous-scroll-bar-mode): New variable
+	(set-scroll-bar-mode): Set previous-scroll-bar-mode.
+	(scroll-bar-mode): Use previous-scroll-bar-mode if set.
+
+	* term/x-win.el: Set scroll bar mode to right if set by X resources.
+
 2006-12-30  Richard Stallman  <rms@gnu.org>
 
 	* files.el (make-backup-file-name-1): Precompute abs name