- (or w (setq w 78))
- (let ((win (selected-window))
- (c (/ (+ (window-width) mdw-scrollbar-width)
- (+ w mdw-scrollbar-width))))
+ (or w (setq w (if (and window-system
+ (>= emacs-major-version 22))
+ 77
+ 78)))
+ (let* ((win (selected-window))
+ (sb-width (if (not window-system)
+ 1
+ (+ (scroll-bar-columns 'left)
+ (scroll-bar-columns 'right)
+ (fringe-columns 'left)
+ (fringe-columns 'right))))
+ (c (/ (+ (window-width) sb-width)
+ (+ w sb-width))))