[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/olivetti 906974e 031/134: Fixes #5
From: |
Stefan Monnier |
Subject: |
[elpa] externals/olivetti 906974e 031/134: Fixes #5 |
Date: |
Thu, 25 Apr 2019 09:57:22 -0400 (EDT) |
branch: externals/olivetti
commit 906974ec6877cfbe4ec3717e0e0f30bb43bc29da
Author: Paul Rankin <address@hidden>
Commit: Paul Rankin <address@hidden>
Fixes #5
---
olivetti.el | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/olivetti.el b/olivetti.el
index fab09be..cbd6329 100644
--- a/olivetti.el
+++ b/olivetti.el
@@ -133,6 +133,13 @@ mode line. Finally redraw the frame."
(setq-local mode-line-format nil)))
(redraw-frame (selected-frame)))
+(defun olivetti-scale-width (n)
+ (let ((face-height (or (plist-get (cadr (assoc 'default
+ face-remapping-alist))
+ :height)
+ 1)))
+ (round (* n face-height))))
+
(defun olivetti-safe-width (n)
"Parse N to a safe value for `olivetti-body-width'."
(let ((window-width (- (window-total-width)
@@ -166,7 +173,9 @@ mode line. Finally redraw the frame."
(defun olivetti-set-environment ()
"Set text body width to `olivetti-body-width' with relative margins."
- (let* ((n (olivetti-safe-width olivetti-body-width))
+ (let* ((n (olivetti-safe-width (if (integerp olivetti-body-width)
+ (olivetti-scale-width olivetti-body-width)
+ olivetti-body-width)))
(width (cond ((integerp n) n)
((floatp n) (* (window-total-width) n))))
(margin (max (round (/ (- (window-total-width) width)
@@ -228,6 +237,8 @@ hidden."
'olivetti-set-environment nil t)
(add-hook 'after-setting-font-hook
'olivetti-set-environment nil t)
+ (add-hook 'text-scale-mode-hook
+ 'olivetti-set-environment nil t)
(visual-line-mode 1)
(olivetti-set-environment))
(olivetti-set-mode-line 'exit)
@@ -235,6 +246,8 @@ hidden."
(remove-hook 'window-configuration-change-hook
'olivetti-set-environment t)
(remove-hook 'after-setting-font-hook
+ 'olivetti-set-environment t)
+ (remove-hook 'text-scale-mode-hook
'olivetti-set-environment t)))
(provide 'olivetti)
- [elpa] externals/olivetti 5cfe277 020/134: Changed body-width standard-value to 80, (continued)
- [elpa] externals/olivetti 5cfe277 020/134: Changed body-width standard-value to 80, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 514bc46 009/134: Using run-window-configuration-change-hook fn, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 2363de6 008/134: Fixed margin reset on exit, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 885fb20 019/134: Added minimum-body-width, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 06bf86f 016/134: Add hook when changing fonts, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 30e3cbe 014/134: Added README/Commentary, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 869221a 013/134: Removed delete-selection-mode, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti ea4a25f 011/134: Obsessive cleanliness, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 554461c 012/134: Added toggle-hide-modeline, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti f213afd 017/134: Added safe-width fun, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 906974e 031/134: Fixes #5,
Stefan Monnier <=
- [elpa] externals/olivetti 30b82ff 018/134: Made body-width buffer-local, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti e0dabc0 024/134: Obsessive cleanliness, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 4252fe4 026/134: Deleted unneeded .gitignore, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti b42eb3e 029/134: Allow set-width to accept any number, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 34b8a54 032/134: Added doc string, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 7b215a7 037/134: Fixes #7, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 41c6642 039/134: Update MELPA URL, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 947b1c0 044/134: Custom option to recall visual-line-mode entry state, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 0653b07 043/134: Make olivetti-set-environment act on the list of all buffer windows, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 42d5822 048/134: Add keymap, Stefan Monnier, 2019/04/25