[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/olivetti cb22f8a 127/134: Merge pull request #25 from N
From: |
Stefan Monnier |
Subject: |
[elpa] externals/olivetti cb22f8a 127/134: Merge pull request #25 from Nielius/fix-scale-width |
Date: |
Thu, 25 Apr 2019 09:57:44 -0400 (EDT) |
branch: externals/olivetti
commit cb22f8ab14b7a7ad3b3650b0e36a1b61d1253950
Merge: 0227265 d40a054
Author: Paul W. Rankin <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #25 from Nielius/fix-scale-width
Fixed olivetti-scale-width for integer heights
---
olivetti.el | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/olivetti.el b/olivetti.el
index 0998e80..16c177f 100644
--- a/olivetti.el
+++ b/olivetti.el
@@ -275,11 +275,15 @@ instead `olivetti-set-mode-line'."
For compatibility with `text-scale-mode', if
`face-remapping-alist' includes a :height property on the default
-face, scale N by that factor, otherwise scale by 1."
- (* n (or (plist-get (cadr (assq 'default
- face-remapping-alist))
- :height)
- 1)))
+face, scale N by that factor if it is a fraction, by (height/100)
+if it is an integer, and otherwise scale by 1."
+ (let
+ ((height (plist-get (cadr (assq 'default face-remapping-alist))
:height)))
+ (cond
+ ((integerp height) (* n (/ height 100.0)))
+ ((floatp height) (* n height))
+ (t n))))
+
(defun olivetti-safe-width (width window)
"Parse WIDTH to a safe value for `olivetti-body-width' for WINDOW.
- [elpa] externals/olivetti 4f9210b 074/134: Don't use min-margins - there is a better way, (continued)
- [elpa] externals/olivetti 4f9210b 074/134: Don't use min-margins - there is a better way, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 3f237b0 075/134: Use split-window window-parameter, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti e515385 083/134: Docstring update, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti de2716c 081/134: Only reset all windows on exit, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti fd5d85b 097/134: Enhance short description, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 85ecdfc 099/134: Revert "Enhance short description", Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 7bf367c 105/134: Updated README/Commentary, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 7eadbe7 108/134: Rewrite olivetti-safe-width for fringes, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti fc3b045 116/134: Readded window-configuration-change-hook, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti ff2b0a0 123/134: Change default body width to 70 (matches fill-column standard-value), Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti cb22f8a 127/134: Merge pull request #25 from Nielius/fix-scale-width,
Stefan Monnier <=
- [elpa] externals/olivetti 3859a4d 030/134: Added known bugs section to README/Commentary, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 16d0885 035/134: Fix "modeline" => "mode-line", Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 26e9da6 041/134: Use defvar-local, it's cleaner, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti d852e31 040/134: Merge pull request #8 from syohex/update-url, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti f629184 042/134: Merge branch 'master' of https://github.com/rnkn/olivetti, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 48874ef 045/134: Hiding mode-line seems to work without frame redrawing, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 6818914 047/134: Neatening docs, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 78ef7ae 046/134: Reset margins in all buffer windows, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 6933bf9 049/134: More neatening up, Stefan Monnier, 2019/04/25
- [elpa] externals/olivetti 35654fe 054/134: Added note about temporary-overlay-map, Stefan Monnier, 2019/04/25