[vim/vim] Enable z= even when 'spell' is disabled (#6227)

17 views
Skip to first unread message

Gary Johnson

unread,
Jun 9, 2020, 2:58:03 PM6/9/20
to vim/vim, Subscribed

The spell command z= and functions spellbadword() and spellsuggest() are
now functional even when 'spell' is disabled. Documentation and tests
have been updated and the issue has been removed from todo.txt.

You can view, comment on, or merge this pull request online at:

  https://github.com/vim/vim/pull/6227

Commit Summary

  • Enable z= even when 'spell' is disabled

File Changes

Patch Links:

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

Christian Brabandt

unread,
Jun 9, 2020, 3:32:25 PM6/9/20
to vim/vim, Subscribed

Thanks for converting into a proper PR! 👍

Gary Johnson

unread,
Jun 9, 2020, 4:20:21 PM6/9/20
to reply+ACY5DGEQ2HFL5I47DN...@reply.github.com, vim...@googlegroups.com
On 2020-06-09, Christian Brabandt wrote:
> Thanks for converting into a proper PR! 👍

You're welcome. With the instructions from Yegappan, it was pretty
easy. I just needed a shove.

However...

The AppVeyor build failed with errors in term.c. I didn't change
term.c, or any header files. See:

https://ci.appveyor.com/project/chrisbra/vim/builds/33419078/job/8k28jgpkb0s2rhr5

The failures begin with this:

gcc -c -I. -Iproto -DWIN32 -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 -DHAVE_PATHDEF -DFEAT_HUGE -DHAVE_STDINT_H -DHAVE_GETTEXT -DHAVE_LOCALE_H -DDYNAMIC_GETTEXT -DFEAT_CSCOPE -DFEAT_JOB_CHANNEL -DFEAT_IPV6 -DHAVE_INET_NTOP -DFEAT_TERMINAL -DFEAT_SOUND -DFEAT_MBYTE_IME -DDYNAMIC_IME -DDYNAMIC_ICONV -pipe -march=i686 -Wall -O2 term.c -o obji686/term.o
term.c: In function 'handle_u7_response':
term.c:4394:2: warning: implicit declaration of function 'LOG_TR' [-Wimplicit-function-declaration]
4394 | LOG_TR(("Received U7 status: %s", tp));
| ^~~~~~
term.c:4394:34: warning: left-hand operand of comma expression has no effect [-Wunused-value]
4394 | LOG_TR(("Received U7 status: %s", tp));
| ^
term.c:4395:2: error: 'u7_status' undeclared (first use in this function); did you mean 'job_status'?
4395 | u7_status.tr_progress = STATUS_GOT;
| ^~~~~~~~~
| job_status
term.c:4395:2: note: each undeclared identifier is reported only once for each function it appears in
term.c:4395:26: error: 'STATUS_GOT' undeclared (first use in this function); did you mean 'STATSTG'?
4395 | u7_status.tr_progress = STATUS_GOT;
| ^~~~~~~~~~
| STATSTG

and go on from there.

This was a HUGE build on Windows, "Building MinGW 32bit console
version", which I'm not currently set up to replicate.

What now?

Regards,
Gary

vim-dev ML

unread,
Jun 9, 2020, 4:20:43 PM6/9/20
to vim/vim, vim-dev ML, Your activity

Christian Brabandt

unread,
Jun 9, 2020, 4:32:19 PM6/9/20
to vim/vim, vim-dev ML, Comment

yes, I also noticed that. Can you rebase on 8.2.940? I think Bram has already fixed it with the last 2 changes (your PR seems to be based on 8.2.938)

—
You are receiving this because you commented.

Yegappan Lakshmanan

unread,
Jun 9, 2020, 4:35:46 PM6/9/20
to vim_dev, reply+ACY5DGEQ2HFL5I47DN...@reply.github.com
Hi Gary,

On Tue, Jun 9, 2020 at 1:20 PM Gary Johnson <gary...@spocom.com> wrote:
On 2020-06-09, Christian Brabandt wrote:
> Thanks for converting into a proper PR! 👍

You're welcome.  With the instructions from Yegappan, it was pretty
easy.  I just needed a shove.

However...

The AppVeyor build failed with errors in term.c.  I didn't change
term.c, or any header files.  See:

    https://ci.appveyor.com/project/chrisbra/vim/builds/33419078/job/8k28jgpkb0s2rhr5

The failures begin with this:

    gcc -c -I. -Iproto -DWIN32 -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 -DHAVE_PATHDEF -DFEAT_HUGE -DHAVE_STDINT_H -DHAVE_GETTEXT -DHAVE_LOCALE_H -DDYNAMIC_GETTEXT -DFEAT_CSCOPE -DFEAT_JOB_CHANNEL -DFEAT_IPV6 -DHAVE_INET_NTOP -DFEAT_TERMINAL -DFEAT_SOUND -DFEAT_MBYTE_IME -DDYNAMIC_IME -DDYNAMIC_ICONV -pipe -march=i686 -Wall -O2 term.c -o obji686/term.o
    term.c: In function 'handle_u7_response':
    term.c:4394:2: warning: implicit declaration of function 'LOG_TR' [-Wimplicit-function-declaration]
     4394 |  LOG_TR(("Received U7 status: %s", tp));
          |  ^~~~~~
          |                          STATSTG

and go on from there.

This was a HUGE build on Windows, "Building MinGW 32bit console
version", which I'm not currently set up to replicate.

What now?

As you can see from the below report:


The build failure is caused by "patch 8.2.0939: checking for term escape sequences
is long and confusing" and is not related to your PR.

BTW, I forgot to mention about the code coverage in the mail yesterday. You can
check the code coverage for your changes at the below link:


It is good to maintain the code coverage percentage by adding additional tests
for the new/changed lines of code.

- Yegappan

vim-dev ML

unread,
Jun 9, 2020, 4:36:05 PM6/9/20
to vim/vim, vim-dev ML, Your activity

codecov[bot]

unread,
Jun 9, 2020, 6:56:25 PM6/9/20
to vim/vim, vim-dev ML, Comment

Codecov Report

Merging #6227 into master will increase coverage by 0.00%.
The diff coverage is 72.41%.

Impacted file tree graph

@@           Coverage Diff           @@

##           master    #6227   +/-   ##

=======================================

  Coverage   87.37%   87.37%           

=======================================

  Files         143      143           

  Lines      158119   158145   +26     

=======================================

+ Hits       138157   138184   +27     

+ Misses      19962    19961    -1
Impacted Files Coverage Δ
src/evalfunc.c 96.20% <68.18%> (-0.24%) ⬇️
src/spellsuggest.c 92.59% <85.71%> (-0.04%) ⬇️
src/if_xcmdsrv.c 88.38% <0.00%> (-0.53%) ⬇️
src/testing.c 92.56% <0.00%> (-0.22%) ⬇️
src/gui_gtk_x11.c 58.85% <0.00%> (-0.20%) ⬇️
src/gui.c 63.87% <0.00%> (-0.06%) ⬇️
src/message.c 88.34% <0.00%> (-0.05%) ⬇️
src/os_unix.c 70.80% <0.00%> (-0.05%) ⬇️
src/window.c 89.17% <0.00%> (+0.06%) ⬆️
src/sign.c 95.02% <0.00%> (+0.08%) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ca8b5b...12cd956. Read the comment docs.

—
You are receiving this because you commented.

Gary Johnson

unread,
Jun 9, 2020, 9:00:40 PM6/9/20
to vim/vim, vim-dev ML, Push

@ghgary pushed 1 commit.

  • c83cb8a Add spell tests to improve coverage

—
You are receiving this because you are subscribed to this thread.

View it on GitHub or unsubscribe.

Bram Moolenaar

unread,
Jun 10, 2020, 9:32:43 AM6/10/20
to vim/vim, vim-dev ML, Comment

Closed #6227 via 152e79e.

—
You are receiving this because you commented.

Reply all
Reply to author
Forward
0 new messages