From debbugs-submit-bounces@debbugs.gnu.org Thu May 31 00:50:23 2018 Received: (at submit) by debbugs.gnu.org; 31 May 2018 04:50:23 +0000 Received: from localhost ([127.0.0.1]:55509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOFXb-0007KK-0g for submit@debbugs.gnu.org; Thu, 31 May 2018 00:50:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOFXY-0007K4-Cr for submit@debbugs.gnu.org; Thu, 31 May 2018 00:50:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOFXS-0001XC-8Y for submit@debbugs.gnu.org; Thu, 31 May 2018 00:50:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52120) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fOFXS-0001Wy-4Q for submit@debbugs.gnu.org; Thu, 31 May 2018 00:50:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOFXQ-000519-QU for bug-gnu-emacs@gnu.org; Thu, 31 May 2018 00:50:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOFXM-0001TU-1c for bug-gnu-emacs@gnu.org; Thu, 31 May 2018 00:50:12 -0400 Received: from mail-qt0-x230.google.com ([2607:f8b0:400d:c0d::230]:33529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOFXL-0001So-Se for bug-gnu-emacs@gnu.org; Thu, 31 May 2018 00:50:07 -0400 Received: by mail-qt0-x230.google.com with SMTP id e8-v6so26384562qth.0 for ; Wed, 30 May 2018 21:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=user-agent:from:to:subject:date:message-id:mime-version; bh=OBCSrmlNnSTQ5qGUHz/vkmaPha+q4pPMhKCAyrvj7Dk=; b=BdC31kYxalbtXaj3d8K1Mpyr/L5jwTOQ1jZVVPws++JqtMu62W28tn4YotjTZsyZsr 7aQRgotJCiDAfriu52nY/42eMu3xRfmrTLI8djaJBVeVrEyxX2yFsUXYOYUDAUJx+QrD nBd0sZgOTAaa+/+pAeCJWMWlnp9xQY/Lj9Xi/7OUyOnvqEwU79EXYapbxrBPGLtQ14PW z1oM8mFH+ZJ/TSHbS9ErYZFaCubTMIqJEuNST79pMPqdb9vbjSm134Vb04a0Hh+Y4L6k N6hJzuh87XAtEIVv0hIvfH2h3te1qjHI29Sx6lX9OBv5XqQ7WWca0EqKhm5bICH2oAw7 s+Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=OBCSrmlNnSTQ5qGUHz/vkmaPha+q4pPMhKCAyrvj7Dk=; b=dFMYkw/D76t40/eGMs1Cna/rYxnE19sQkVRo+peYgBiaPWD9gkwUsyUwMY6xPWq1Ti XoHTihXukPTo3AfS2T8e3XWAwbkqtw/EozS7Q9P4lJrm6lBDRhOdyj/43BVEV3SEmvpd eiXekhFT5XRCNhtedqqi96/EUjY3t107bKzjfRkiQciBM648qSjK6jAFR1nykM3v/ZiU 2dS3OFHsBMHrcdbR6aYEGl73/DgkKGjhoWRTtWOlUsUyO4Nv54y3tMpfDwWvrXTJ0Ks5 w5+obGlyEDTpWNS6Rlp6CLWygYzqA1M2gCO2P76t7GE69a1EfuYb5P8AzqiD/Tmha6jq lCpQ== X-Gm-Message-State: APt69E1p128kB6b+XsEZVEISc6CufwbygZQkBal/BginQqA8a6rPe72G WfYN3Oa8Sn+G8/z1fFsaOk1DFYep X-Google-Smtp-Source: ADUXVKJU7wmbnNeiC4Toix+olRYQPBUANoPbEvkSiV8ROW6037DpWeqV6rVGzRgDYFfT8qgeUJje2g== X-Received: by 2002:a0c:a0c3:: with SMTP id c61-v6mr5266399qva.200.1527742206608; Wed, 30 May 2018 21:50:06 -0700 (PDT) Received: from 4eebc6dfcecc (cpe-184-152-55-93.nyc.res.rr.com. [184.152.55.93]) by smtp.gmail.com with ESMTPSA id p72-v6sm17434818qkh.5.2018.05.30.21.50.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 21:50:05 -0700 (PDT) User-agent: mu4e 1.1.0; emacs 27.0.50 From: John Shahid To: bug-gnu-emacs@gnu.org Subject: [PATCH] fix double counting bug in term.el Date: Thu, 31 May 2018 04:49:53 +0000 Message-ID: <87muwgpgy6.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) --=-=-= Content-Type: text/plain Hi all, Today I was trying to run fzf[1] in term when I ran into a weird issue that will cause the term output to be clobbered with certain output. The root cause seems to be a double counting in the column offset. This is usually fine, unless `2*len(inserted text)' causes the point to be equal to the window width. I fixed the issue and added a new test in the attached patch [1] https://github.com/junegunn/fzf --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-lisp-term.el-term-emulate-terminal-fix-column-double.patch >From efeec7bb556084f7004a83faf679f724bb8a0fe8 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Wed, 30 May 2018 23:55:16 -0400 Subject: [PATCH] * lisp/term.el (term-emulate-terminal): fix column double counting --- lisp/term.el | 3 ++- test/lisp/term-tests.el | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/term.el b/lisp/term.el index 19e68ddb49..67cebda1be 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -2904,7 +2904,8 @@ term-emulate-terminal (when (not (or (eobp) term-insert-mode)) (let ((pos (point))) (term-move-columns columns) - (delete-region pos (point)))) + (delete-region pos (point)) + (term-move-columns (- columns)))) ;; In insert mode if the current line ;; has become too long it needs to be ;; chopped off. diff --git a/test/lisp/term-tests.el b/test/lisp/term-tests.el index 8aaa61a210..e27dd0354d 100644 --- a/test/lisp/term-tests.el +++ b/test/lisp/term-tests.el @@ -89,6 +89,13 @@ term-test-screen-from-input "\e[2;1Hc" "\e[1;2Hb" "\e[1;1Ha") "" t)))) + (should (equal "abcde j" + (term-test-screen-from-input + 10 12 (concat "\e[mabcdefghij" + "\e[H" ;move back to point-min + "\e[mabcde" + "\e[m j")))) + ;; Relative positioning. (should (equal "ab\ncd" (term-test-screen-from-input -- 2.17.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 31 18:51:14 2018 Received: (at 31662) by debbugs.gnu.org; 31 May 2018 22:51:14 +0000 Received: from localhost ([127.0.0.1]:56358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOWPa-0000jk-K8 for submit@debbugs.gnu.org; Thu, 31 May 2018 18:51:14 -0400 Received: from mail-it0-f46.google.com ([209.85.214.46]:37016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOWPa-0000jX-1Z for 31662@debbugs.gnu.org; Thu, 31 May 2018 18:51:14 -0400 Received: by mail-it0-f46.google.com with SMTP id l6-v6so16732154iti.2 for <31662@debbugs.gnu.org>; Thu, 31 May 2018 15:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=muvkubTVBPMBtrW2hg5/J88ffyXLP27Y2rFCtb1tytE=; b=MV6zz69pS95Cx6oQ6AEUUrXREbO0Tc+dpvPBO/WNEyM+XVrAqBlo/7Y8OOHxUEm5Cz rL9RtI1rD2wLGRqub1ucskSVrjE2wn4wGp4ulWL90hEru5Y7NTDcDoONUgbbnwz2qXqZ 6k1e4d4OL5PL4qi0ed4SQpctr6q2Np8IZ4aKgf9E6Twth17o+Er/sy3ndbHNr6KedMW4 zkC2v8C7e954e8PjkrcWVwNZxdfRM4QWhptKR7l/bb6TYmULEkucAGUhhSwv9/aSuXmV EcpmgyiVptKgLZ5yUT/1ZsT/MRQKdnwM7ysNakSKXsEPP1AvdNNw0pcs1TjQAHjwKdiR qEKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=muvkubTVBPMBtrW2hg5/J88ffyXLP27Y2rFCtb1tytE=; b=LV7977ktJ0T6tcIMEKJ1gwWFuFhsEso1sEnf7bGCcEEl1uKsDPT1aarkArB9GVzJXj 0d4YcvgZcTrjTG1MpuH1k4bgqBTO8+almxqblLtDX7nW3K5zzZ3gJWU1SP3B1AeJqKRi 6IY2MyopCZZgwyPYU7FiPf8rgwett4qwNtr3HdgrCQHPxTh/Z7aCPFOxwfBQHGjcNofc 8AoSB9xRcjpGRiKzfeSHK5hLFyw4Lguetapi+6+u5L9ERAiu/f/6LbVS48bzTqGaaZzk 3TG4EZyc54KoBAxFadzGjCRW7N06LkdpnefoL4drpsrhOBJ9TlLUM8lSJQ2P0js834XN 32rA== X-Gm-Message-State: APt69E1hiJBtJ3bKD4FGVsdSyIWBaV2q+iGsHOvLvGr/bShPrYdrX3RE klVes/Q/7wASkfVAExcp99BwAw== X-Google-Smtp-Source: ADUXVKJtPItsG2rkUq4Zu9f5KFhlH1+Gs3SKkYPcNmqnaVK35qXv24us0/rt4ICLfi7QkaCtEpTUVw== X-Received: by 2002:a24:74ce:: with SMTP id o197-v6mr1879450itc.107.1527807068403; Thu, 31 May 2018 15:51:08 -0700 (PDT) Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id o1-v6sm272484ite.37.2018.05.31.15.51.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 May 2018 15:51:07 -0700 (PDT) From: Noam Postavsky To: John Shahid Subject: Re: bug#31662: [PATCH] fix double counting bug in term.el References: <87muwgpgy6.fsf@gmail.com> Date: Thu, 31 May 2018 18:51:06 -0400 In-Reply-To: <87muwgpgy6.fsf@gmail.com> (John Shahid's message of "Thu, 31 May 2018 04:49:53 +0000") Message-ID: <87sh67bfs5.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31662 Cc: 31662@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) John Shahid writes: > (when (not (or (eobp) term-insert-mode)) > (let ((pos (point))) > (term-move-columns columns) > - (delete-region pos (point)))) > + (delete-region pos (point)) > + (term-move-columns (- columns)))) I think it's a better idea to just reset term-current-column to nil, like what happens in Emacs 26. > + (should (equal "abcde j" > + (term-test-screen-from-input > + 10 12 (concat "\e[mabcdefghij" > + "\e[H" ;move back to point-min > + "\e[mabcde" > + "\e[m j")))) > + The "\e[m" is just to make the strings get processed separately, right? You can pass a list of strings instead: (term-test-screen-from-input 10 12 (list "abcdefghij" "\e[H" ;move back to point-min "abcde" " j")) From debbugs-submit-bounces@debbugs.gnu.org Thu May 31 22:51:26 2018 Received: (at 31662) by debbugs.gnu.org; 1 Jun 2018 02:51:26 +0000 Received: from localhost ([127.0.0.1]:56478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOaA2-0004iZ-5Y for submit@debbugs.gnu.org; Thu, 31 May 2018 22:51:26 -0400 Received: from mail-qt0-f176.google.com ([209.85.216.176]:43499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOaA0-0004i0-QJ for 31662@debbugs.gnu.org; Thu, 31 May 2018 22:51:25 -0400 Received: by mail-qt0-f176.google.com with SMTP id y89-v6so5022517qtd.10 for <31662@debbugs.gnu.org>; Thu, 31 May 2018 19:51:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=E4jyqc+cLFKk6EAZGrjmizYTOYOEQ0ENSoqGHGAINaY=; b=MRpNQ/G3SODoQilhTIX3168WxgcUASaJUImplmgors9MaX+Wsmqf9jiHXfEgcW9VqA FwqJvC8gf2OYRU9soD+S39iUl+3BhI+XRiCh2VoqyCI0lNSpxDg1tfrAAHJnIWMICmZy w83R8IfeAmZLVLFJMsBnmB58w2FYkZuyZ5KzeuaJeL+iNeRaNbLMLzRRt/WHQ4oWqyXz ykRujlAgW/advgkqj/5EA7R/n7fD1nD0+7EZnE728zEnbH5/bCdgOfzME6b9KBgA864B OrKLMJ1aJB6DmIsUky2poL4hAly6kvMHrsPu+KJVjn8+c+MdJB0FsCOYPCcJwBttOkSy W5OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=E4jyqc+cLFKk6EAZGrjmizYTOYOEQ0ENSoqGHGAINaY=; b=FBlYWxeAcAJ9Tbc/Kx/kGAeVlDFoX+QboDCCzKTDKzoTx1ClRay3xnQIFXV6nRTT6K DgDCA4h+djPPaeYS2xmCNVMEzK7ch1qic1R2AwsA9k4Wevo08+RI+wez2UbMul0PlDd5 nuwZ171/oeLGNiggy8Up+aF4+Tdbv6RtTKD41O/sP8A6HIE3GvdlWwpYZ9dVFYMeJGCD hysbOqAsUUJQdkC3T+cS9rQX8ERCgCr9pCi8QGlU7vvLSRBvoUzQt7vQz3KncNcXwWmW JiFFtpIG99CmmkwRUS5EqvFtjL/P4SkrQA5I87feXDPLgF/iFHXUzB7NflH7ZvEbuarT Xc2A== X-Gm-Message-State: APt69E0tQByTBrqnrNqU7U3ReK2jrIcwEDl6FnXhoJ3W5hI9MSQhMeKC ++8R4yYcJBUKXbIg/L36SPeJ1t/g X-Google-Smtp-Source: ADUXVKJ0t9aj5SuMdC+BwCxIn+d6XQ7Oo/7N/8lSEqXk90GyHW3rcB3jVpliXfJL+hmUEnQee+Vuhg== X-Received: by 2002:ac8:668c:: with SMTP id d12-v6mr4847778qtp.5.1527821478763; Thu, 31 May 2018 19:51:18 -0700 (PDT) Received: from c77051f00eff (cpe-184-152-55-93.nyc.res.rr.com. [184.152.55.93]) by smtp.gmail.com with ESMTPSA id n37-v6sm11418086qkh.71.2018.05.31.19.51.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 19:51:17 -0700 (PDT) References: <87muwgpgy6.fsf@gmail.com> <87sh67bfs5.fsf@gmail.com> User-agent: mu4e 1.1.0; emacs 27.0.50 From: John Shahid To: Noam Postavsky Subject: Re: bug#31662: [PATCH] fix double counting bug in term.el In-reply-to: <87sh67bfs5.fsf@gmail.com> Date: Fri, 01 Jun 2018 02:51:11 +0000 Message-ID: <87lgbzdxsw.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31662 Cc: 31662@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Thanks for the feedback. I fixed both issues in the attached patch. Noam Postavsky writes: > John Shahid writes: >> (when (not (or (eobp) term-insert-mode)) >> (let ((pos (point))) >> (term-move-columns columns) >> - (delete-region pos (point)))) >> + (delete-region pos (point)) >> + (term-move-columns (- columns)))) > > I think it's a better idea to just reset term-current-column to nil, > like what happens in Emacs 26. > >> + (should (equal "abcde j" >> + (term-test-screen-from-input >> + 10 12 (concat "\e[mabcdefghij" >> + "\e[H" ;move back to point-min >> + "\e[mabcde" >> + "\e[m j")))) >> + > > The "\e[m" is just to make the strings get processed separately, right? > You can pass a list of strings instead: > > (term-test-screen-from-input > 10 12 (list "abcdefghij" > "\e[H" ;move back to point-min > "abcde" > " j")) --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-lisp-term.el-term-emulate-terminal-fix-column-double.patch >From c9a8ac75923f7b48bcf3285f2c3b6e3a6d9e75b2 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Wed, 30 May 2018 23:55:16 -0400 Subject: [PATCH] * lisp/term.el (term-emulate-terminal): fix column double counting --- lisp/term.el | 3 ++- test/lisp/term-tests.el | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/term.el b/lisp/term.el index 19e68ddb49..715f39bbbf 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -2904,7 +2904,8 @@ term-emulate-terminal (when (not (or (eobp) term-insert-mode)) (let ((pos (point))) (term-move-columns columns) - (delete-region pos (point)))) + (delete-region pos (point)) + (setq term-current-column nil))) ;; In insert mode if the current line ;; has become too long it needs to be ;; chopped off. diff --git a/test/lisp/term-tests.el b/test/lisp/term-tests.el index 8aaa61a210..72a9ad1ef7 100644 --- a/test/lisp/term-tests.el +++ b/test/lisp/term-tests.el @@ -89,6 +89,13 @@ term-test-screen-from-input "\e[2;1Hc" "\e[1;2Hb" "\e[1;1Ha") "" t)))) + (should (equal "abcde j" + (term-test-screen-from-input + 10 12 '("abcdefghij" + "\e[H" ;move back to point-min + "abcde" + " j")))) + ;; Relative positioning. (should (equal "ab\ncd" (term-test-screen-from-input -- 2.17.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 01 22:25:06 2018 Received: (at 31662) by debbugs.gnu.org; 2 Jun 2018 02:25:06 +0000 Received: from localhost ([127.0.0.1]:58268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOwE5-0001i2-QU for submit@debbugs.gnu.org; Fri, 01 Jun 2018 22:25:05 -0400 Received: from mail-it0-f49.google.com ([209.85.214.49]:51355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOwE5-0001hV-22 for 31662@debbugs.gnu.org; Fri, 01 Jun 2018 22:25:05 -0400 Received: by mail-it0-f49.google.com with SMTP id d10-v6so3959376itj.1 for <31662@debbugs.gnu.org>; Fri, 01 Jun 2018 19:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=QE1WCcJcdScwBrLDuglJRiZLPAjjKZjYI0s9F5DVDsc=; b=E/N6wgL/61shFcc1C0LLL23J1IJEJVSF537uIUKvIxxXgjB50otTmnU7f+/fopq3Q/ I+2ht6ob3bdX9CXL2+ldw7APJT982jaJj7fqooS5btM3CjNxi2RT9k+UW5rFB649V9XJ btRoYalM0HFe2Jso/oIYiuIN/EdBoAMnCTBTa1W6Yy/YONRwfaNjL3cTc5T+nlaHWqCM fFmYIU+gQKaR0HkK4YqklDWyT/h6hJNxSqeT/IlTayMytmRFW6fosCTAc6yCX0y5QVuL WjJTnyVkmj0bmY0m0np31SdTsyGemKkgJc37SbbUZzUOCKBpzG89egrLHG9u+v/mnU1R xSGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=QE1WCcJcdScwBrLDuglJRiZLPAjjKZjYI0s9F5DVDsc=; b=NCqg8OSAGQqVim/HFZKT2BWPH4p8R9CCSXKbKwZ/D44XDxZi3412aWilYw7j3aaALU dEBzKUQWfUHriwoX+LJ64H6nxaR7qMrKRa0ES0frutzkJ+wVd2EwuPqrGqrU0Ixu9v+h yzr6cIntu+bebRdnEIOJ2EeROyLSb0OO42iSaq3LaNj+lALtcDQr0z1wzFDTFG7UxV6s 9DJcvR7k0b5/kvu+tCl2uo9bU3aMS3CgALMtB2QoYwo30Z1NbuxlL1Ph5Ju3bzfBITXo AxNNmltIUulJq3BOInpX99Pq0rwb3a9BrUSs8ikZkEMwN6QgsdSrnW7An/JlXDJkmmPQ jd3A== X-Gm-Message-State: APt69E0VbMSXQsgZULqz13chpQ4a91yaZtIqLEaL4O7pxezZAqA0XWu/ JgN6/bRWdANv1pdWX2AQSjDTrA== X-Google-Smtp-Source: ADUXVKJddIC7Lv3NQBfhlgifgMWg/C4WslD78CAAIZ68bcCyLPpgZwdNII+9ZlyYOjUPH/Ryx+vGfw== X-Received: by 2002:a24:9457:: with SMTP id j84-v6mr7149490ite.102.1527906299584; Fri, 01 Jun 2018 19:24:59 -0700 (PDT) Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id g26-v6sm892686iti.0.2018.06.01.19.24.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 19:24:59 -0700 (PDT) From: Noam Postavsky To: John Shahid Subject: Re: bug#31662: [PATCH] fix double counting bug in term.el References: <87muwgpgy6.fsf@gmail.com> <87sh67bfs5.fsf@gmail.com> <87lgbzdxsw.fsf@gmail.com> Date: Fri, 01 Jun 2018 22:24:57 -0400 In-Reply-To: <87lgbzdxsw.fsf@gmail.com> (John Shahid's message of "Fri, 01 Jun 2018 02:51:11 +0000") Message-ID: <876032aps6.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31662 Cc: 31662@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) John Shahid writes: > Thanks for the feedback. I fixed both issues in the attached patch. Thanks, looks good. > Subject: [PATCH] * lisp/term.el (term-emulate-terminal): fix column double > counting Minor nitpick ChangeLog formatting nitpick, the sentence should be capitalized and end with a period. Have you assigned copyright for Emacs? (the patch is small enough to go in regardless, but it would need to be marked as a tiny change) From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 01 22:43:36 2018 Received: (at 31662) by debbugs.gnu.org; 2 Jun 2018 02:43:36 +0000 Received: from localhost ([127.0.0.1]:58272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOwW0-00028W-CV for submit@debbugs.gnu.org; Fri, 01 Jun 2018 22:43:36 -0400 Received: from mail-qk0-f181.google.com ([209.85.220.181]:42586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOwVz-00028D-3m for 31662@debbugs.gnu.org; Fri, 01 Jun 2018 22:43:35 -0400 Received: by mail-qk0-f181.google.com with SMTP id j80-v6so19648904qke.9 for <31662@debbugs.gnu.org>; Fri, 01 Jun 2018 19:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:message-id:in-reply-to :date:mime-version; bh=xlb8PIxEZIXZ5Wgy9cEWtc8PeGehhH7M4yJg+RK3HSw=; b=tpMnb2KEEkefklbqchLZpW3DM62ZYVwhqLTRzYkYW+iopm2mXd7Wa+KkIMuRiA8eDD ZfRq2bBwfiLnzaL4JsEk3oLQy8nvEpKTbLTtXZfM/6AswM/UwQY+kRoJYwcHl8CG7rgB tZ9H/fUWh2mgBcr6NRN/20Cc0inCw73craF08KcEkidydsttx6f52U9voYO5cMsP0pEc yO8xq5ZvQ65tAdfuIkrhM9OAQoeslSer7dqykTMBKIhpDU3hHwcCILMCOF0B1neNfZ// YesXNX9jL4bgDSA/NvNlM1PoPwRVe2JSMVvuDxtOb6CMzqHdUQY+3qQPvJlSpn7Uc7uU +xGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :message-id:in-reply-to:date:mime-version; bh=xlb8PIxEZIXZ5Wgy9cEWtc8PeGehhH7M4yJg+RK3HSw=; b=uPPlkHFJxCn87N8OeWXQVTbbRtVhg4i2o4VLeHfu1iM8ndbi78Zn+BZ7HwwJ4ceQA6 zLh7S+ORvEcVksPlbPyfIHrYgR0Igf95bqw/1jAqi4t1+Uw4ZKOAVyxwNr4qQ/DL56Qr 3DLT21aaBei7F6W2TFayK8cLHyEp/II/LNwVb6jNpfrl6Hpv3EdqdI3EoNQsy3cY0XSR cNh5CZ0AtqayO1w8MpagKmrdh3l+hQ0o95XVAHhIc5iJx9d0Wig2B71H3k9JBo88kH9Q Tv4/crbMSOViHErGG2KGT/8fYIEcQaMxPiePa0g+BXg3gdA8oL26DXFV7GwNInGH4zbY Mb3w== X-Gm-Message-State: APt69E0C72bstURq3DT/rCv4duEixx43wkM3E9THiMxx14FDds/9oyaE USWHqXsxCIIxsJjwNsnQ7MlLmVzy X-Google-Smtp-Source: ADUXVKIWyD56GL7fBWXVFF3sgV93kLJa7MkfLeUD01cYDpBj9kCYFh3hHaUfME1l40yv/E4DZ8+WKg== X-Received: by 2002:a37:7943:: with SMTP id u64-v6mr12504364qkc.13.1527907409186; Fri, 01 Jun 2018 19:43:29 -0700 (PDT) Received: from f387b2e1cb5c (cpe-184-152-55-93.nyc.res.rr.com. [184.152.55.93]) by smtp.gmail.com with ESMTPSA id n6-v6sm30112331qte.36.2018.06.01.19.43.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jun 2018 19:43:28 -0700 (PDT) References: <87muwgpgy6.fsf@gmail.com> <87sh67bfs5.fsf@gmail.com> <87lgbzdxsw.fsf@gmail.com> <876032aps6.fsf@gmail.com> User-agent: mu4e 1.1.0; emacs 27.0.50 From: John Shahid To: Noam Postavsky Subject: Re: bug#31662: [PATCH] fix double counting bug in term.el Message-ID: <87r2lpc3i5.fsf@gmail.com> In-reply-to: <876032aps6.fsf@gmail.com> Date: Sat, 02 Jun 2018 02:43:23 +0000 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31662 Cc: 31662@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Noam Postavsky writes: > John Shahid writes: > >> Thanks for the feedback. I fixed both issues in the attached patch. > > Thanks, looks good. > >> Subject: [PATCH] * lisp/term.el (term-emulate-terminal): fix column double >> counting > > Minor nitpick ChangeLog formatting nitpick, the sentence should be > capitalized and end with a period. fixed in the attached patch > > Have you assigned copyright for Emacs? (the patch is small enough to go > in regardless, but it would need to be marked as a tiny change) Yes I did. Should I attach the signed assignment to the bug report ? cheers, -js --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-lisp-term.el-term-emulate-terminal-Fix-column-double.patch >From 26219852992155889e142fb2b45f559ec6318c28 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Wed, 30 May 2018 23:55:16 -0400 Subject: [PATCH] * lisp/term.el (term-emulate-terminal): Fix column double counting. --- lisp/term.el | 3 ++- test/lisp/term-tests.el | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/term.el b/lisp/term.el index 19e68ddb49..715f39bbbf 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -2904,7 +2904,8 @@ term-emulate-terminal (when (not (or (eobp) term-insert-mode)) (let ((pos (point))) (term-move-columns columns) - (delete-region pos (point)))) + (delete-region pos (point)) + (setq term-current-column nil))) ;; In insert mode if the current line ;; has become too long it needs to be ;; chopped off. diff --git a/test/lisp/term-tests.el b/test/lisp/term-tests.el index 8aaa61a210..72a9ad1ef7 100644 --- a/test/lisp/term-tests.el +++ b/test/lisp/term-tests.el @@ -89,6 +89,13 @@ term-test-screen-from-input "\e[2;1Hc" "\e[1;2Hb" "\e[1;1Ha") "" t)))) + (should (equal "abcde j" + (term-test-screen-from-input + 10 12 '("abcdefghij" + "\e[H" ;move back to point-min + "abcde" + " j")))) + ;; Relative positioning. (should (equal "ab\ncd" (term-test-screen-from-input -- 2.17.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 01 23:13:12 2018 Received: (at 31662) by debbugs.gnu.org; 2 Jun 2018 03:13:12 +0000 Received: from localhost ([127.0.0.1]:58281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOwye-0002nv-1K for submit@debbugs.gnu.org; Fri, 01 Jun 2018 23:13:12 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:52445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOwyb-0002nd-Gj; Fri, 01 Jun 2018 23:13:10 -0400 Received: by mail-it0-f68.google.com with SMTP id m194-v6so4023582itg.2; Fri, 01 Jun 2018 20:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=/UFOxLbzPpaE5wqQCY2405TIZleqhjPnufT9hDyC7bo=; b=ve5RvcbvVZd8z5k4nEM16t2Qkdwe0OTK9p7q6yTdXsIPZr3qtbVkqp8sQm6P374xnh mk5cW9nctUofAF+ZhfDiCytwXhUjNHUHtzFnKNElvjbFofS6gkJAwsAXkJGeiwK9VTI/ 8gPu1ftC2U/bf1T6nnc0nu+tjQXQaxGQgUm8XY8XHtDf78NUuwaDsoHm1xU84iJ9T5/k zVXWT1s8C48E4BeViNsUXXyrIlbZeynW+HZcLfwNV1mHeKBI/EY6GX1/orYIFupNj6eE al6KLeTZJK5D9+qA6xjTySjw9eohfJd3d1KizUkiP5ujD2ziBtwUOcHukUc1A1kK/c7l 4/9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=/UFOxLbzPpaE5wqQCY2405TIZleqhjPnufT9hDyC7bo=; b=FQ7A9nRP9CPJx8XRBRwPpOsk08uA7NP7LSI/9+yFB4+e8B341bZpqIBBoahdhE1yIP u6EYwC2ccD/V3oArn6UFigkU1FzBV7q3M1zqLBwc23EScm1yl4BFYB8XbFfq4A3ErZo4 jiSk2C+x8Vhjf8WVGtSoTs7OaInLyHxPoRUftohtGeAoi242ZopxiTCcoX6pa7hBk9/3 UeHRO7cnQWf2ssQxxVeJij++Xfs53XwTkXV94tP+XaeJhz3TABQNeMfumds7bL4HHPEi MgrnyrSoJAUpHAr/TntCIHMr4V/LxvR3MzxlDIlSk2szlZFD2OZpSEU2+oAPgjPGeOcc YX5g== X-Gm-Message-State: ALKqPwfUNBjG2t4sfmbJwIlvOQPne+15c4gu7HzZlEyWAx2zaggt+wug Tr1Gnf1rd1UMdAw4syEuQMvp+A== X-Google-Smtp-Source: ADUXVKKLMTjQphioMMc8QG3ssUkONGVedSe401LNvxbPtmyWc326wcznG6B9UpI+l+dDW8RNFHqvmQ== X-Received: by 2002:a24:5c53:: with SMTP id q80-v6mr4649785itb.118.1527909183873; Fri, 01 Jun 2018 20:13:03 -0700 (PDT) Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id 2-v6sm1821605itk.17.2018.06.01.20.13.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 20:13:02 -0700 (PDT) From: Noam Postavsky To: John Shahid Subject: Re: bug#31662: [PATCH] fix double counting bug in term.el References: <87muwgpgy6.fsf@gmail.com> <87sh67bfs5.fsf@gmail.com> <87lgbzdxsw.fsf@gmail.com> <876032aps6.fsf@gmail.com> <87r2lpc3i5.fsf@gmail.com> Date: Fri, 01 Jun 2018 23:13:01 -0400 In-Reply-To: <87r2lpc3i5.fsf@gmail.com> (John Shahid's message of "Sat, 02 Jun 2018 02:43:23 +0000") Message-ID: <8736y5c24i.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 31662 Cc: 31662@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) found 31662 27.0.50 tags 31662 fixed close 31662 quit John Shahid writes: >> Minor nitpick ChangeLog formatting nitpick, the sentence should be >> capitalized and end with a period. > > fixed in the attached patch Thanks, pushed to master [1: 9ac76456eb]. (Actually, I noticed the commit message had gotten too long, so I edited that a bit more first) >> Have you assigned copyright for Emacs? (the patch is small enough to go >> in regardless, but it would need to be marked as a tiny change) > > Yes I did. Should I attach the signed assignment to the bug report ? No need for that, I just take your word for it. I'm sure Eli (who has access to the official list) will step in if anybody lies about it, but why would they? :) [1: 9ac76456eb]: 2018-06-01 23:06:34 -0400 Fix column double counting in term.el (Bug#31662) https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=9ac76456eb104f749aa9c60b99c68a649214efc6 From unknown Tue Sep 09 21:32:30 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 30 Jun 2018 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator