From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: John Shahid Newsgroups: gmane.emacs.bugs Subject: bug#31662: [PATCH] fix double counting bug in term.el Date: Sat, 02 Jun 2018 02:43:23 +0000 Message-ID: <87r2lpc3i5.fsf@gmail.com> References: <87muwgpgy6.fsf@gmail.com> <87sh67bfs5.fsf@gmail.com> <87lgbzdxsw.fsf@gmail.com> <876032aps6.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1527907330 9947 195.159.176.226 (2 Jun 2018 02:42:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 2 Jun 2018 02:42:10 +0000 (UTC) User-Agent: mu4e 1.1.0; emacs 27.0.50 Cc: 31662@debbugs.gnu.org To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 02 04:42:06 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fOwUY-0002SO-2q for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Jun 2018 04:42:06 +0200 Original-Received: from localhost ([::1]:58131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOwWd-0006Wz-RC for geb-bug-gnu-emacs@m.gmane.org; Fri, 01 Jun 2018 22:44:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOwWU-0006Wi-By for bug-gnu-emacs@gnu.org; Fri, 01 Jun 2018 22:44:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOwWR-0004Ha-1a for bug-gnu-emacs@gnu.org; Fri, 01 Jun 2018 22:44:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOwWQ-0004Gq-SP for bug-gnu-emacs@gnu.org; Fri, 01 Jun 2018 22:44:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fOwWQ-00029G-FU for bug-gnu-emacs@gnu.org; Fri, 01 Jun 2018 22:44:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: John Shahid Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 02 Jun 2018 02:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31662 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 31662-submit@debbugs.gnu.org id=B31662.15279074168220 (code B ref 31662); Sat, 02 Jun 2018 02:44:02 +0000 Original-Received: (at 31662) by debbugs.gnu.org; 2 Jun 2018 02:43:36 +0000 Original-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 Original-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 Original-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) Original-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) In-reply-to: <876032aps6.fsf@gmail.com> 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: 208.118.235.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:146836 Archived-At: --=-=-= 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 --=-=-=--