From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#37563: 27.0.50; fit-frame-to-buffer does not account for line-spacing Date: Tue, 1 Oct 2019 09:32:08 +0200 Message-ID: References: <87tv8tsk3f.fsf@kenko.localhost.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------BDE0F6A92FDBF15CD1C3688D" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="121167"; mail-complaints-to="usenet@blaine.gmane.org" To: Ingo Lohmar , 37563@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 01 09:33:49 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iFCfM-000VRV-Kh for geb-bug-gnu-emacs@m.gmane.org; Tue, 01 Oct 2019 09:33:48 +0200 Original-Received: from localhost ([::1]:59508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFCfI-0000FA-7B for geb-bug-gnu-emacs@m.gmane.org; Tue, 01 Oct 2019 03:33:45 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50176) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFCed-0000Eh-5l for bug-gnu-emacs@gnu.org; Tue, 01 Oct 2019 03:33:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFCec-0005wR-0s for bug-gnu-emacs@gnu.org; Tue, 01 Oct 2019 03:33:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFCeb-0005wA-Sg for bug-gnu-emacs@gnu.org; Tue, 01 Oct 2019 03:33:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFCeb-0005FA-LZ for bug-gnu-emacs@gnu.org; Tue, 01 Oct 2019 03:33:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 01 Oct 2019 07:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37563 X-GNU-PR-Package: emacs Original-Received: via spool by 37563-submit@debbugs.gnu.org id=B37563.156991513820095 (code B ref 37563); Tue, 01 Oct 2019 07:33:01 +0000 Original-Received: (at 37563) by debbugs.gnu.org; 1 Oct 2019 07:32:18 +0000 Original-Received: from localhost ([127.0.0.1]:60802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFCdu-0005E3-I9 for submit@debbugs.gnu.org; Tue, 01 Oct 2019 03:32:18 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]:44895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFCds-0005Dq-Vz for 37563@debbugs.gnu.org; Tue, 01 Oct 2019 03:32:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569915128; bh=fc48re5Np4KN+pKzjDAq0cpQAVwRWtPBkiVznL5E9KY=; h=X-UI-Sender-Class:Subject:To:References:From:Date:In-Reply-To; b=GLvuV4ZLyr9HX+CNGihiTnp7SmMPqNJyqVbmc61m7OazbOv59KTfyb4dUHG48zN8H 7ekK5QgfqGrPXRQxdIYMLNyMp+8BP437+18euOWLP+vKqaJFs8n5fvXOS5HtsTdmAG /xh27Wv/rBBN7e05I49mQF5weGFYxxw5Ik8vQgzk= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.101] ([212.95.5.139]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MZTqW-1ibsTu0rJ8-00WWbD; Tue, 01 Oct 2019 09:32:08 +0200 In-Reply-To: <87tv8tsk3f.fsf@kenko.localhost.com> Content-Language: de-AT X-Provags-ID: V03:K1:jWWzjs0Oe6VSAsGSJYIhztBB7+Jlr7VYTt4coln8sWcI3cCtNZG J17MjYsZuSC70UPoeouKTdAxYlz+4fH9aNd7MTnANCQx60xTxIB7NV0W0VmHTW8P/+EJmDm Us8XLP+9/o/Jjw1TMVfaKr4cpWjYgDQXGcv4yc44kHPb8q50L0MwBiPG65LhwoRq/cjRkgz QntADB33ne0sPVq7m7bOQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:5MPm/r6mNrM=:dGV8foyBgUP9kD/Qzq5e7h 74w0cDVb0q/gfS/UfjNLqxWHLNBC8w2hwSY6leAJo4J7LOZs43xyEX712sH3F6looug2eNOBb I+QKOYkPpDdvidmAeOHqoSMMN4Vc4EBeapDPaenQwN8LqsyoC3UyHllKBQuOc/zWUEe66A4G8 /KPAaM5joXU1HwmAix6WkFKu0Fc//aYyuu7EQYmGuQsWBe9axCNYeNloSANiZH3mJtcrevDp5 dvfRRAwN8emLUtTfzRXxgunh6uTk10NxLH7yVSBDIj37M6xopvjdGzBGXGA0QMnl0FSngCLTK NkXFj3G0sy5lDzJdr85l/EIFpaWXfUFX4pKhj0w9wCSijpFgoHCapkRiIiJAiSaDwg03oTioR dbhe9B38ggP7ySUh4nxIJDKaAM9F9wgVbqSB0pTSafBoMxOtRgOeitcl3wROHVWFeWMA4jmIl J7SAvAuxpWCxTpYvNrOGrFap5oqcD9F65KqNY98RZtDWW6mN9lwU/zISTcHI0RdQ942wOJ3v/ slm2f3YVT+omVoHM5N4VL/VsAAsnmy+vKubFm3FV8sI+mvA22wEU1KhyfwSj64oborU8quxqr Qd8WA5jlBEnKD03h3FNzoC+qVCCfwVlQ2biM4KiH5N124bAc8qdrF39IADqabmmkAOJAPZ44w erYzds0NivpHS4IaOFdwziXmPX2KcSyOQ1fULZREPz5hBrQl9/kzvgqmYeY9hb9lpfRyQ1nHE N+/GPaFVN3b3NYUULwq/Qe6y9/t5MolQmRW6rXFgd7Y2gJqjOx4Q9Tyu3dz2HDUgg3ipG7Q1 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:167973 Archived-At: This is a multi-part message in MIME format. --------------BDE0F6A92FDBF15CD1C3688D Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit > 1) When max-height is provided, the actual frame height is calculated in > ll 8736ff of window.el (as of commit > 5746202c182a9c69c732beb29b8507a6e6364799), and that just multiplies by > the char-height, which excludes the line-spacing. This is the buggy > case. I attached a fix. Please try it. Many thanks for the report, martin --------------BDE0F6A92FDBF15CD1C3688D Content-Type: text/plain; charset=UTF-8; name="fit-frame-to-buffer.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="fit-frame-to-buffer.diff" ZGlmZiAtLWdpdCBhL2xpc3Avd2luZG93LmVsIGIvbGlzcC93aW5kb3cuZWwKaW5kZXggY2Y3 MzMxNTNiOC4uM2RmNDYzNTMzYyAxMDA2NDQKLS0tIGEvbGlzcC93aW5kb3cuZWwKKysrIGIv bGlzcC93aW5kb3cuZWwKQEAgLTg0OTQsNiArODQ5NCw0MCBAQCB3aW5kb3ctYnVmZmVyLWhl aWdodAogCQkJICAgICAoZW9icCkKIAkJCSAgICAgd2luZG93KSkpKQogCisoZGVmdW4gd2lu ZG93LWNoYXItaGVpZ2h0ICgmb3B0aW9uYWwgd2luZG93KQorICAiUmV0dXJuIG51bWJlciBv ZiBwaXhlbHMgb2YgdGhlIGhlaWdodCBvZiBhIGNoYXJhY3RlciBpbiBXSU5ET1cuCitXSU5E T1cgbXVzdCBiZSBhIGxpdmUgd2luZG93IGFuZCBkZWZhdWx0cyB0byB0aGUgc2VsZWN0ZWQg b25lLgorVGhlIHJldHVybiB2YWx1ZSBhY2NvdW50cyBmb3IgYW55IHJlbWFwcGluZyBvZiB0 aGUgZGVmYXVsdCBmYWNlCitvZiBXSU5ET1cncyBmcmFtZS4iCisgIDs7IENvZGUgbW9zdGx5 IHN0b2xlbiBmcm9tIHNpbXBsZS5lbCdzIGBkZWZhdWx0LWZvbnQtaGVpZ2h0Jy4KKyAgKGxl dCogKCh3aW5kb3cgKHdpbmRvdy1ub3JtYWxpemUtd2luZG93IHdpbmRvdyB0KSkKKwkgKGZy YW1lICh3aW5kb3ctZnJhbWUgd2luZG93KSkKKwkgKGRlZmF1bHQtZm9udCAoZmFjZS1mb250 ICdkZWZhdWx0IGZyYW1lKSkpCisgICAgKGNvbmQKKyAgICAgKChhbmQgKGRpc3BsYXktbXVs dGktZm9udC1wIChmcmFtZS1wYXJhbWV0ZXIgZnJhbWUgJ2Rpc3BsYXkpKQorCSAgIChub3Qg KHN0cmluZy1lcXVhbCAoZnJhbWUtcGFyYW1ldGVyIGZyYW1lICdmb250KSBkZWZhdWx0LWZv bnQpKSkKKyAgICAgIChhcmVmIChmb250LWluZm8gZGVmYXVsdC1mb250IGZyYW1lKSAzKSkK KyAgICAgKHQgKGZyYW1lLWNoYXItaGVpZ2h0IGZyYW1lKSkpKSkKKworKGRlZnVuIHdpbmRv dy1saW5lLWhlaWdodCAoJm9wdGlvbmFsIHdpbmRvdykKKyAgIlJldHVybiBudW1iZXIgb2Yg cGl4ZWxzIG9mIGEgdGV4dCBsaW5lIGluIFdJTkRPVy4KK1dJTkRPVyBtdXN0IGJlIGEgbGl2 ZSB3aW5kb3cgYW5kIGRlZmF1bHRzIHRvIHRoZSBzZWxlY3RlZCBvbmUuCitUaGUgcmV0dXJu IHZhbHVlIGluY2x1ZGVzIGFueSBsaW5lIHNwYWNpbmcgZGVmaW5lZCBmb3IgV0lORE9XJ3MK K2J1ZmZlciBvciBmcmFtZS4iCisgIDs7IENvZGUgbW9zdGx5IHN0b2xlbiBmcm9tIHNpbXBs ZS5lbCdzIGBkZWZhdWx0LWxpbmUtaGVpZ2h0Jy4KKyAgKGxldCogKCh3aW5kb3cgKHdpbmRv dy1ub3JtYWxpemUtd2luZG93IHdpbmRvdyB0KSkKKwkgKGNoYXItaGVpZ2h0ICh3aW5kb3ct Y2hhci1oZWlnaHQgd2luZG93KSkKKwkgKGJ1ZmZlciAod2luZG93LWJ1ZmZlciB3aW5kb3cp KQorCSAoZnJhbWUgKHdpbmRvdy1mcmFtZSB3aW5kb3cpKQorCSAoc3BhY2UtaGVpZ2h0CisJ ICAob3IgKGFuZCAoZGlzcGxheS1ncmFwaGljLXApCisJCSAgIChvciAoYnVmZmVyLWxvY2Fs LXZhbHVlICdsaW5lLXNwYWNpbmcgYnVmZmVyKQorCQkgICAgICAgKGZyYW1lLXBhcmFtZXRl ciBmcmFtZSAnbGluZS1zcGFjaW5nKSkpCisJICAgICAgMCkpKQorICAgICh3aGVuIChmbG9h dHAgc3BhY2UtaGVpZ2h0KQorICAgICAgKHNldHEgc3BhY2UtaGVpZ2h0ICh0cnVuY2F0ZSAo KiBjaGFyLWhlaWdodCBzcGFjZS1oZWlnaHQpKSkpCisgICAgKCsgY2hhci1oZWlnaHQgc3Bh Y2UtaGVpZ2h0KSkpCisKIDs7OyBSZXNpemluZyB3aW5kb3dzIGFuZCBmcmFtZXMgdG8gZml0 IHRoZWlyIGNvbnRlbnRzIGV4YWN0bHkuCiAoZGVmY3VzdG9tIGZpdC13aW5kb3ctdG8tYnVm ZmVyLWhvcml6b250YWxseSBuaWwKICAgIk5vbi1uaWwgbWVhbnMgYGZpdC13aW5kb3ctdG8t YnVmZmVyJyBjYW4gcmVzaXplIHdpbmRvd3MgaG9yaXpvbnRhbGx5LgpAQCAtODYzNiw2ICs4 NjcwLDcgQEAgZml0LWZyYW1lLXRvLWJ1ZmZlcgogICAgICAgICAgICAoY2hhci1oZWlnaHQg KGZyYW1lLWNoYXItaGVpZ2h0IGZyYW1lKSkKICAgICAgICAgICAgOzsgV0lORE9XIGlzIEZS QU1FJ3Mgcm9vdCB3aW5kb3cuCiAgICAgICAgICAgICh3aW5kb3cgKGZyYW1lLXJvb3Qtd2lu ZG93IGZyYW1lKSkKKyAgICAgICAgICAgKGxpbmUtaGVpZ2h0ICh3aW5kb3ctbGluZS1oZWln aHQgd2luZG93KSkKICAgICAgICAgICAgKHBhcmVudCAoZnJhbWUtcGFyZW50IGZyYW1lKSkK ICAgICAgICAgICAgKG1vbml0b3ItYXR0cmlidXRlcwogICAgICAgICAgICAgKHVubGVzcyBw YXJlbnQKQEAgLTg3MzIsMTYgKzg3NjcsMTYgQEAgZml0LWZyYW1lLXRvLWJ1ZmZlcgogICAg ICAgICAgICAobWF4LWhlaWdodAogICAgICAgICAgICAgKG1pbgogICAgICAgICAgICAgIChj b25kCi0gICAgICAgICAgICAgICgobnVtYmVycCBtYXgtaGVpZ2h0KSAoKiBtYXgtaGVpZ2h0 IGNoYXItaGVpZ2h0KSkKLSAgICAgICAgICAgICAgKChudW1iZXJwIChudGggMCBzaXplcykp ICgqIChudGggMCBzaXplcykgY2hhci1oZWlnaHQpKQorICAgICAgICAgICAgICAoKG51bWJl cnAgbWF4LWhlaWdodCkgKCogbWF4LWhlaWdodCBsaW5lLWhlaWdodCkpCisgICAgICAgICAg ICAgICgobnVtYmVycCAobnRoIDAgc2l6ZXMpKSAoKiAobnRoIDAgc2l6ZXMpIGxpbmUtaGVp Z2h0KSkKICAgICAgICAgICAgICAgKHQgcGFyZW50LW9yLWRpc3BsYXktaGVpZ2h0KSkKICAg ICAgICAgICAgICA7OyBUaGUgZm9sbG93aW5nIGlzIHRoZSBtYXhpbXVtIGhlaWdodCB0aGF0 IGZpdHMgaW50byB0aGUKICAgICAgICAgICAgICA7OyB0b3AgYW5kIGJvdHRvbSBtYXJnaW5z LgogICAgICAgICAgICAgIChtYXggKC0gYm90dG9tLW1hcmdpbiB0b3AtbWFyZ2luIG91dGVy LW1pbnVzLWJvZHktaGVpZ2h0KSkpKQogICAgICAgICAgICAobWluLWhlaWdodAogICAgICAg ICAgICAgKGNvbmQKLSAgICAgICAgICAgICAoKG51bWJlcnAgbWluLWhlaWdodCkgKCogbWlu LWhlaWdodCBjaGFyLWhlaWdodCkpCi0gICAgICAgICAgICAgKChudW1iZXJwIChudGggMSBz aXplcykpICgqIChudGggMSBzaXplcykgY2hhci1oZWlnaHQpKQorICAgICAgICAgICAgICgo bnVtYmVycCBtaW4taGVpZ2h0KSAoKiBtaW4taGVpZ2h0IGxpbmUtaGVpZ2h0KSkKKyAgICAg ICAgICAgICAoKG51bWJlcnAgKG50aCAxIHNpemVzKSkgKCogKG50aCAxIHNpemVzKSBsaW5l LWhlaWdodCkpCiAgICAgICAgICAgICAgKHQgKHdpbmRvdy1taW4tc2l6ZSB3aW5kb3cgbmls IG5pbCB0KSkpKQogICAgICAgICAgICAobWF4LXdpZHRoCiAgICAgICAgICAgICAobWluCgo= --------------BDE0F6A92FDBF15CD1C3688D--