From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 12 Sep 2002 03:21:21 +0000 (+0000)
Subject: (ruler-mode-left-scroll-bar-cols):
X-Git-Tag: ttn-vms-21-2-B4~13218
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b3f70a03ac7832ee8568dbb656ced3025b036f7;p=emacs.git

(ruler-mode-left-scroll-bar-cols):
Always round scroll-bar-width parameter up.
If it is nil, use 14.
---

diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 35c4449b58a..4c709167100 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -451,8 +451,12 @@ C-mouse-2: hide tabs"
 (defmacro ruler-mode-left-scroll-bar-cols ()
   "Return the width, measured in columns, of the left vertical scrollbar."
   '(if (eq (frame-parameter nil 'vertical-scroll-bars) 'left)
-       (round (or (frame-parameter nil 'scroll-bar-width) 0)
-              (frame-char-width))
+       (let ((sbw (frame-parameter nil 'scroll-bar-width)))
+	 ;; nil means it's a non-toolkit scroll bar,
+	 ;; and its width in columns is 14 pixels rounded up.
+	 (unless sbw (setq sbw 14))
+	 ;; Always round up to multiple of columns.
+	 (ceiling sbw (frame-char-width)))
      0))
 
 (defmacro ruler-mode-right-scroll-bar-cols ()