Patch 8.1.1464
17 views
Skip to first unread message
Bram Moolenaar
Jun 4, 2019, 3:41:58 PM6/4/19
to vim...@googlegroups.com
Patch 8.1.1464
Problem: Only 4-digit rgb termresponse is recognized.
Solution: Also recognize 2-digit rgb response. (closes #4486)
Files: src/term.c, src/test_termcodes.vim
*** ../vim-8.1.1463/src/term.c 2019-05-28 23:08:12.080648632 +0200
--- src/term.c 2019-06-04 21:23:11.508570961 +0200
***************
*** 4962,4967 ****
--- 4962,4968 ----
/* Check for fore/background color response from the terminal:
*
* {lead}{code};rgb:{rrrr}/{gggg}/{bbbb}{tail}
+ * or {lead}{code};rgb:{rr}/{gg}/{bb}{tail}
*
* {code} is 10 for foreground, 11 for background
* {lead} can be <Esc>] or OSC
***************
*** 4985,4998 ****
: (tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')))
{
int is_bg = argp[1] == '1';
! if (i - j >= 21 && STRNCMP(tp + j + 3, "rgb:", 4) == 0
! && tp[j + 11] == '/' && tp[j + 16] == '/')
{
# ifdef FEAT_TERMINAL
! int rval = hexhex2nr(tp + j + 7);
! int gval = hexhex2nr(tp + j + 12);
! int bval = hexhex2nr(tp + j + 17);
# endif
if (is_bg)
{
--- 4986,5004 ----
: (tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')))
{
int is_bg = argp[1] == '1';
+ int is_4digit = i - j >= 21 && tp[j + 11] == '/'
+ && tp[j + 16] == '/';
! if (i - j >= 14 && STRNCMP(tp + j + 3, "rgb:", 4) == 0
! && (is_4digit
! || (tp[j + 9] == '/' && tp[i + 12 == '/'])))
{
# ifdef FEAT_TERMINAL
! int rval, gval, bval;
!
! rval = hexhex2nr(tp + j + 7);
! gval = hexhex2nr(tp + j + (is_4digit ? 12 : 10));
! bval = hexhex2nr(tp + j + (is_4digit ? 17 : 13));
# endif
if (is_bg)
{
*** ../vim-8.1.1463/src/version.c 2019-06-04 19:16:25.518124894 +0200
--- src/version.c 2019-06-04 21:39:56.729716125 +0200
***************
*** 769,770 ****
--- 769,772 ----
{ /* Add new patch number below this line */
+ /**/
+ 1464,
/**/
--
From "know your smileys":
+<(:-) The Pope
/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Marcin Szamotulski
Jun 4, 2019, 4:18:58 PM6/4/19
to vim...@googlegroups.com
Hello vim_dev,
I was always struck by the inconsistency of file ordere as returned by `:find lost.file` and command completion, e.g. `:e **/lost.file^d`. If there are multiple files of with name `lost.file` `:find` will explore them in different order than what completion will suggest. Maybe somebody would like to try fix this, or maybe this is a feature?
Best regards,
Marcin
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> ====================
>
> ======
>
>
> - && tp[j + 16] == '/';
>
> ====================
>
> ======
> - 1464,
> --
> You received this message from the "vim_dev" maillist.
> Do not top-post! Type your reply below the text you are replying to.
> For more information, visit http://www.vim.org/maillist.php
>
>
> You received this message because you are subscribed to the Google Groups "vim_dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+u...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/201906041941.x54JfmlM006862%40masaka.moolenaar.net.
> For more options, visit https://groups.google.com/d/optout.
I was always struck by the inconsistency of file ordere as returned by `:find lost.file` and command completion, e.g. `:e **/lost.file^d`. If there are multiple files of with name `lost.file` `:find` will explore them in different order than what completion will suggest. Maybe somebody would like to try fix this, or maybe this is a feature?
Best regards,
Marcin
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Tuesday, 4 June 2019 21:41, Bram Moolenaar <Br...@moolenaar.net> wrote:
>
>
> Patch 8.1.1464
> Problem: Only 4-digit rgb termresponse is recognized.
> Solution: Also recognize 2-digit rgb response. (closes #4486)
> Files: src/term.c, src/test_termcodes.vim
>
> *** ../vim-8.1.1463/src/term.c 2019-05-28 23:08:12.080648632 +0200
> --- src/term.c 2019-06-04 21:23:11.508570961 +0200
>
>
>
> Patch 8.1.1464
> Problem: Only 4-digit rgb termresponse is recognized.
> Solution: Also recognize 2-digit rgb response. (closes #4486)
> Files: src/term.c, src/test_termcodes.vim
>
> *** ../vim-8.1.1463/src/term.c 2019-05-28 23:08:12.080648632 +0200
> --- src/term.c 2019-06-04 21:23:11.508570961 +0200
>
> *** 4962,4967 ****
> --- 4962,4968 ----
> /* Check for fore/background color response from the terminal:
> *
> * {lead}{code};rgb:{rrrr}/{gggg}/{bbbb}{tail}
>
> - * or {lead}{code};rgb:{rr}/{gg}/{bb}{tail}
> --- 4962,4968 ----
> /* Check for fore/background color response from the terminal:
> *
> * {lead}{code};rgb:{rrrr}/{gggg}/{bbbb}{tail}
>
> *
> * {code} is 10 for foreground, 11 for background
> * {lead} can be <Esc>] or OSC
>
>
>
> * {code} is 10 for foreground, 11 for background
> * {lead} can be <Esc>] or OSC
>
>
>
> *** 4985,4998 ****
> : (tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')))
> {
> int is_bg = argp[1] == '1';
>
> ! if (i - j >= 21 && STRNCMP(tp + j + 3, "rgb:", 4) == 0
> ! && tp[j + 11] == '/' && tp[j + 16] == '/')
> {
>
> ifdef FEAT_TERMINAL
> : (tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')))
> {
> int is_bg = argp[1] == '1';
>
> ! if (i - j >= 21 && STRNCMP(tp + j + 3, "rgb:", 4) == 0
> ! && tp[j + 11] == '/' && tp[j + 16] == '/')
> {
>
>
> ====================
>
> ! int rval = hexhex2nr(tp + j + 7);
> ! int gval = hexhex2nr(tp + j + 12);
> ! int bval = hexhex2nr(tp + j + 17);
>
> endif
> ! int rval = hexhex2nr(tp + j + 7);
> ! int gval = hexhex2nr(tp + j + 12);
> ! int bval = hexhex2nr(tp + j + 17);
>
>
> ======
>
> if (is_bg)
> {
>
>
> --- 4986,5004 ----
> : (tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')))
> {
> int is_bg = argp[1] == '1';
>
> - int is_4digit = i - j >= 21 && tp[j + 11] == '/'
> if (is_bg)
> {
>
>
> --- 4986,5004 ----
> : (tp[i] == ESC && i + 1 < len && tp[i + 1] == '\\')))
> {
> int is_bg = argp[1] == '1';
>
>
>
> - && tp[j + 16] == '/';
>
>
>
> ! if (i - j >= 14 && STRNCMP(tp + j + 3, "rgb:", 4) == 0
> ! && (is_4digit
> ! || (tp[j + 9] == '/' && tp[i + 12 == '/'])))
> {
>
> ifdef FEAT_TERMINAL
>
>
> ! if (i - j >= 14 && STRNCMP(tp + j + 3, "rgb:", 4) == 0
> ! && (is_4digit
> ! || (tp[j + 9] == '/' && tp[i + 12 == '/'])))
> {
>
>
> ====================
>
> ! int rval, gval, bval;
> !
> ! rval = hexhex2nr(tp + j + 7);
> ! gval = hexhex2nr(tp + j + (is_4digit ? 12 : 10));
> ! bval = hexhex2nr(tp + j + (is_4digit ? 17 : 13));
>
> endif
> ! int rval, gval, bval;
> !
> ! rval = hexhex2nr(tp + j + 7);
> ! gval = hexhex2nr(tp + j + (is_4digit ? 12 : 10));
> ! bval = hexhex2nr(tp + j + (is_4digit ? 17 : 13));
>
>
> ======
>
> if (is_bg)
> {
>
>
> *** ../vim-8.1.1463/src/version.c 2019-06-04 19:16:25.518124894 +0200
> --- src/version.c 2019-06-04 21:39:56.729716125 +0200
>
> if (is_bg)
> {
>
>
> *** ../vim-8.1.1463/src/version.c 2019-06-04 19:16:25.518124894 +0200
> --- src/version.c 2019-06-04 21:39:56.729716125 +0200
>
> *** 769,770 ****
> --- 769,772 ----
> { /* Add new patch number below this line */
>
> - /**/
> --- 769,772 ----
> { /* Add new patch number below this line */
>
> - 1464,
>
>
> /**/
>
> --
> From "know your smileys":
> +<(:-) The Pope
>
> /// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
> /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
> \\\ an exciting new programming language -- http://www.Zimbu.org ///
> \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
>
> --
>
> /**/
>
> --
> From "know your smileys":
> +<(:-) The Pope
>
> /// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
> /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
> \\\ an exciting new programming language -- http://www.Zimbu.org ///
> \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
>
> --
> You received this message from the "vim_dev" maillist.
> Do not top-post! Type your reply below the text you are replying to.
> For more information, visit http://www.vim.org/maillist.php
>
>
> You received this message because you are subscribed to the Google Groups "vim_dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+u...@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/201906041941.x54JfmlM006862%40masaka.moolenaar.net.
> For more options, visit https://groups.google.com/d/optout.
Marcin Szamotulski
Jun 4, 2019, 4:20:34 PM6/4/19
to vim...@googlegroups.com
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Tuesday, 4 June 2019 22:18, Marcin Szamotulski <profu...@pm.me> wrote:
> Hello vim_dev,
>
> I was always struck by the inconsistency of file ordere as returned by `:find lost.file` and command completion, e.g. `:e **/lost.file^d`. If there are multiple files of with name `lost.file` `:find` will explore them in different order than what completion will suggest. Maybe somebody would like to try fix this, or maybe this is a feature?
Ups, I sent it as a reply; It was meant to sent as a new thread.
> Hello vim_dev,
>
> I was always struck by the inconsistency of file ordere as returned by `:find lost.file` and command completion, e.g. `:e **/lost.file^d`. If there are multiple files of with name `lost.file` `:find` will explore them in different order than what completion will suggest. Maybe somebody would like to try fix this, or maybe this is a feature?
Regards,
Marcin
Reply all
Reply to author
Forward
0 new messages