mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

Fix 'window-max-chars-per-line' when there are no fringes

Browse Source 
* lisp/window.el (window-max-chars-per-line): Fix the way we
account for the fringes by calling 'window-fringes'.  (Bug#59963)
This commit is contained in:
Eli Zaretskii 2022-12-17 14:04:14 +02:00
parent d65beb820c
commit 4d1e4a4893
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/window.el
View File

@ -2162,17 +2162,14 @@ the font."
(let* ((window-width (window-body-width window t))
(font-width (window-font-width window face))
(ncols (- (/ window-width font-width)
(ceiling (line-number-display-width 'columns)))))
(ceiling (line-number-display-width 'columns))))
(fringes (window-fringes window))
(lfringe (car fringes))
(rfringe (nth 1 fringes)))
(if (and (display-graphic-p)
overflow-newline-into-fringe
(not
(or (eq left-fringe-width 0)
(and (null left-fringe-width)
(= (frame-parameter nil 'left-fringe) 0))))
(not
(or (eq right-fringe-width 0)
(and (null right-fringe-width)
(= (frame-parameter nil 'right-fringe) 0)))))
(not (eq lfringe 0))
(not (eq rfringe 0)))
ncols
;; FIXME: This should remove 1 more column when there are no
;; fringes, lines are truncated, and the window is hscrolled,