[Emacs-diffs] Changes to emacs/lisp/ruler-mode.el

[Richard M. Stallman]

Index: emacs/lisp/ruler-mode.el
diff -c emacs/lisp/ruler-mode.el:1.8 emacs/lisp/ruler-mode.el:1.9
*** emacs/lisp/ruler-mode.el:1.8        Sun Sep  1 09:30:19 2002
--- emacs/lisp/ruler-mode.el    Wed Sep 11 23:21:21 2002
***************
*** 451,458 ****
  (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))
       0))
  
  (defmacro ruler-mode-right-scroll-bar-cols ()
--- 451,462 ----
  (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)
!        (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 ()