Skip to content

Do not assume that the default margin widths are zero #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emreyolcu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not assume that the default margin widths are zero #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions olivetti.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,11 @@ if it is an integer, and otherwise return WIDTH."

(defun olivetti-normalize-width (width window)
"Parse WIDTH to a safe pixel value for `olivetti-body-width' for WINDOW."
(let ((char-width (frame-char-width (window-frame window)))
(window-width-pix (window-body-width window t))
min-width-pix)
(let* ((char-width (frame-char-width (window-frame window)))
(window-width-pix (+ (window-body-width window t)
(* char-width
(+ left-margin-width right-margin-width))))
min-width-pix)
(setq min-width-pix (* char-width
(+ olivetti-minimum-body-width
(% olivetti-minimum-body-width 2))))
Comment on lines +272 to 275
Copy link
Copy Markdown
Collaborator

@larstvei larstvei Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because you now use let* anyways, it seems better to also bind min-width-pix in the same let. Something like this:

Suggested change
min-width-pix)
(setq min-width-pix (* char-width
(+ olivetti-minimum-body-width
(% olivetti-minimum-body-width 2))))
(min-width-pix (* char-width
(+ olivetti-minimum-body-width
(% olivetti-minimum-body-width 2)))))

Expand All @@ -283,7 +285,7 @@ if it is an integer, and otherwise return WIDTH."
(if (consp fringe-mode)
(set-window-fringes window (car fringe-mode) (cdr fringe-mode))
(set-window-fringes window fringe-mode fringe-mode))
(set-window-margins window nil))
(set-window-margins window left-margin-width right-margin-width))

(defun olivetti-reset-all-windows ()
"Call `olivetti-reset-window' on all windows."
Expand Down Expand Up @@ -324,10 +326,12 @@ window."
;; `fill-column'
(when (null olivetti-body-width)
(setq olivetti-body-width (+ fill-column 2)))
(let ((char-width-pix (frame-char-width (window-frame window-or-frame)))
(window-width-pix (window-body-width window-or-frame t))
(safe-width-pix (olivetti-normalize-width
olivetti-body-width window-or-frame)))
(let* ((char-width-pix (frame-char-width (window-frame window-or-frame)))
(window-width-pix (+ (window-body-width window-or-frame t)
(* char-width-pix
(+ left-margin-width right-margin-width))))
(safe-width-pix (olivetti-normalize-width
olivetti-body-width window-or-frame)))
;; Handle possible display of fringes
(when (and window-system olivetti-style)
(let ((fringe-total (- (window-pixel-width window-or-frame)
Expand All @@ -350,11 +354,11 @@ window."
(setq left-margin (max (round (/ (- margin-total-pix
(car fringes))
char-width-pix))
0)
left-margin-width)
right-margin (max (round (/ (- margin-total-pix
(cadr fringes))
char-width-pix))
0))
right-margin-width))
;; Finally set the margins
(set-window-margins window-or-frame left-margin right-margin)))
;; Set remaining window parameters
Expand Down