* bug#31662: [PATCH] fix double counting bug in term.el
@ 2018-05-31 4:49 John Shahid
2018-05-31 22:51 ` Noam Postavsky
0 siblings, 1 reply; 6+ messages in thread
From: John Shahid @ 2018-05-31 4:49 UTC (permalink / raw)
To: 31662
[-- Attachment #1: Type: text/plain, Size: 418 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-lisp-term.el-term-emulate-terminal-fix-column-double.patch --]
[-- Type: text/x-diff, Size: 1773 bytes --]
From efeec7bb556084f7004a83faf679f724bb8a0fe8 Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* bug#31662: [PATCH] fix double counting bug in term.el
2018-05-31 4:49 bug#31662: [PATCH] fix double counting bug in term.el John Shahid
@ 2018-05-31 22:51 ` Noam Postavsky
2018-06-01 2:51 ` John Shahid
0 siblings, 1 reply; 6+ messages in thread
From: Noam Postavsky @ 2018-05-31 22:51 UTC (permalink / raw)
To: John Shahid; +Cc: 31662
John Shahid <jvshahid@gmail.com> 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"))
^ permalink raw reply [flat|nested] 6+ messages in thread* bug#31662: [PATCH] fix double counting bug in term.el
2018-05-31 22:51 ` Noam Postavsky
@ 2018-06-01 2:51 ` John Shahid
2018-06-02 2:24 ` Noam Postavsky
0 siblings, 1 reply; 6+ messages in thread
From: John Shahid @ 2018-06-01 2:51 UTC (permalink / raw)
To: Noam Postavsky; +Cc: 31662
[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]
Thanks for the feedback. I fixed both issues in the attached patch.
Noam Postavsky <npostavs@gmail.com> writes:
> John Shahid <jvshahid@gmail.com> 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"))
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-lisp-term.el-term-emulate-terminal-fix-column-double.patch --]
[-- Type: text/x-diff, Size: 1736 bytes --]
From c9a8ac75923f7b48bcf3285f2c3b6e3a6d9e75b2 Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* bug#31662: [PATCH] fix double counting bug in term.el
2018-06-01 2:51 ` John Shahid
@ 2018-06-02 2:24 ` Noam Postavsky
2018-06-02 2:43 ` John Shahid
0 siblings, 1 reply; 6+ messages in thread
From: Noam Postavsky @ 2018-06-02 2:24 UTC (permalink / raw)
To: John Shahid; +Cc: 31662
John Shahid <jvshahid@gmail.com> 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)
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#31662: [PATCH] fix double counting bug in term.el
2018-06-02 2:24 ` Noam Postavsky
@ 2018-06-02 2:43 ` John Shahid
2018-06-02 3:13 ` Noam Postavsky
0 siblings, 1 reply; 6+ messages in thread
From: John Shahid @ 2018-06-02 2:43 UTC (permalink / raw)
To: Noam Postavsky; +Cc: 31662
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
Noam Postavsky <npostavs@gmail.com> writes:
> John Shahid <jvshahid@gmail.com> 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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-lisp-term.el-term-emulate-terminal-Fix-column-double.patch --]
[-- Type: text/x-diff, Size: 1737 bytes --]
From 26219852992155889e142fb2b45f559ec6318c28 Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* bug#31662: [PATCH] fix double counting bug in term.el
2018-06-02 2:43 ` John Shahid
@ 2018-06-02 3:13 ` Noam Postavsky
0 siblings, 0 replies; 6+ messages in thread
From: Noam Postavsky @ 2018-06-02 3:13 UTC (permalink / raw)
To: John Shahid; +Cc: 31662
found 31662 27.0.50
tags 31662 fixed
close 31662
quit
John Shahid <jvshahid@gmail.com> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-02 3:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-31 4:49 bug#31662: [PATCH] fix double counting bug in term.el John Shahid
2018-05-31 22:51 ` Noam Postavsky
2018-06-01 2:51 ` John Shahid
2018-06-02 2:24 ` Noam Postavsky
2018-06-02 2:43 ` John Shahid
2018-06-02 3:13 ` Noam Postavsky
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).