Do not assume that the default margin widths are zero#91
Open
emreyolcu wants to merge 1 commit intornkn:masterfrom
Open
Do not assume that the default margin widths are zero#91emreyolcu wants to merge 1 commit intornkn:masterfrom
emreyolcu wants to merge 1 commit intornkn:masterfrom
Conversation
Owner
|
Looks great, thanks! Might be a week or so until I can test/merge if that's okay. |
Owner
|
Sorry I haven't got to this. @larstvei can you review and merge if there are no issues? |
larstvei
reviewed
Apr 6, 2026
Collaborator
larstvei
left a comment
larstvei
left a comment
There was a problem hiding this comment.
Hi! Sorry for responding late.
I was able to reproduce the bug, and it does seem like this fixes it, so I think this can be merged.
I have one suggestion which I think is a clear improvement.
The other is that the logic introduced in olivetti-normalize-width is repeated in olivetti-set-window. Could you perhaps extract that in a separate function before I merge?
Comment on lines
+272
to
275
| min-width-pix) | ||
| (setq min-width-pix (* char-width | ||
| (+ olivetti-minimum-body-width | ||
| (% olivetti-minimum-body-width 2)))) |
Collaborator
There was a problem hiding this comment.
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))))) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hey Paul, when setting/resetting margin widths Olivetti currently assumes that the default values of
left-margin-widthandright-margin-widthare zero. This assumption was partly removed after #78 in 1690a3c, but we forgot to account for the two other places where the same assumption is made. Those places result in more subtle bugs than the previous one, so I've only recently noticed a problem. When the current window is not wide enough and Olivetti is active (not necessarily in the current window), margins are set to zero instead of their default values. This PR fixes that.EDIT 1: I apparently forgot the mistake I made in #78 and incorporated the same change here. I'll try to see how to calculate the additional width correctly without assuming that
olivetti-reset-windowsets the margin widths to zero.EDIT 2: I've changed the functions
olivetti-normalize-widthandolivetti-set-windowto compute the window's width in pixels by taking the margins into account. If the default margin widths are zero, nothing changes from before; otherwise, margins are treated as if they are part of the window's text area (while fringes, vertical dividers, or scroll bars are still excluded). In my testing this results in the same behavior as before while also respecting the default margin widths.