From: Stefan Monnier <monnier@iro.umontreal.ca>
To: help-gnu-emacs@gnu.org
Subject: Re: UI glitch with text-scale-increase / text-scale-decrease with linum / nlinum
Date: Mon, 09 Feb 2015 12:01:07 -0500 [thread overview]
Message-ID: <jwv61bbrpf0.fsf-monnier+gmane.emacs.help@gnu.org> (raw)
In-Reply-To: CA+JVFq9E98ffrAZ34XeZKzxFY3=NnSsTwurK_-FJhf_V2vGGCA@mail.gmail.com
> I disabled my theme/font settings (to ensure it doesn't interfere),
> patched the file, recompiled the extensions, but I still notice the
> same issue happening.
Duh! I diff'd the wrong file. Here's the patch I had tested.
Stefan
diff --git a/packages/nlinum/nlinum.el b/packages/nlinum/nlinum.el
index 82e274c..67b3717 100644
--- a/packages/nlinum/nlinum.el
+++ b/packages/nlinum/nlinum.el
@@ -1,6 +1,6 @@
;;; nlinum.el --- Show line numbers in the margin -*- lexical-binding: t -*-
-;; Copyright (C) 2012, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2014, 2015 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: convenience
@@ -54,6 +54,7 @@ Linum mode is a buffer-local minor mode."
:lighter nil ;; (" NLinum" nlinum--desc)
(jit-lock-unregister #'nlinum--region)
(remove-hook 'window-configuration-change-hook #'nlinum--setup-window t)
+ (remove-hook 'text-scale-mode-hook #'nlinum--setup-window t)
(remove-hook 'after-change-functions #'nlinum--after-change t)
(kill-local-variable 'nlinum--line-number-cache)
(remove-overlays (point-min) (point-max) 'nlinum t)
@@ -63,6 +64,7 @@ Linum mode is a buffer-local minor mode."
;; FIXME: Another approach would be to make the mode permanent-local,
;; which might indeed be preferable.
(add-hook 'change-major-mode-hook (lambda () (nlinum-mode -1)))
+ (add-hook 'text-scale-mode-hook #'nlinum--setup-window nil t)
(add-hook 'window-configuration-change-hook #'nlinum--setup-window nil t)
(add-hook 'after-change-functions #'nlinum--after-change nil t)
(jit-lock-register #'nlinum--region t))
@@ -71,14 +73,24 @@ Linum mode is a buffer-local minor mode."
(defun nlinum--face-height (face)
(aref (font-info (face-font face)) 2))
+(defun nlinum--face-width (face) ;New info only in Emacs>=25.
+ (let ((fi (font-info (face-font face))))
+ (when (> (length fi) 11)
+ (let ((width (aref fi 11)))
+ (if (<= width 0)
+ (aref fi 10)
+ width)))))
+
(defun nlinum--setup-window ()
(let ((width (if (display-graphic-p)
(ceiling
- ;; We'd really want to check the widths rather than the
- ;; heights, but it's a start.
- (/ (* nlinum--width 1.0
- (nlinum--face-height 'linum))
- (frame-char-height)))
+ (let ((width (nlinum--face-width 'linum)))
+ (if width
+ (/ (* nlinum--width 1.0 width)
+ (frame-char-width))
+ (/ (* nlinum--width 1.0
+ (nlinum--face-height 'linum))
+ (frame-char-height)))))
nlinum--width)))
(set-window-margins nil (if nlinum-mode width)
(cdr (window-margins)))))
next prev parent reply other threads:[~2015-02-09 17:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-08 19:42 UI glitch with text-scale-increase / text-scale-decrease with linum / nlinum Gauthier Segay
2015-02-09 14:57 ` Stefan Monnier
2015-02-09 15:58 ` Gauthier Segay
2015-02-09 17:01 ` Stefan Monnier [this message]
2015-02-09 17:22 ` Gauthier Segay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv61bbrpf0.fsf-monnier+gmane.emacs.help@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.