Fix C-Space insert previously inserted text #6090

hardenedapple · 2017-02-10T17:27:41Z

The default vim binding of C-Space is to insert the last inserted
text and exit insert mode, this doesn't happen in neovim.

This is because insert_handle_key() checks for NUL instead
of checking for ' ' with a control mod_mask.
This patch adds in a check for that.

I'm leaving the check for NUL there despite the fact that
at the moment that key is never seen when using the
terminal UI (not for C-Space, nor C-@).
This is because I assume it's still allowed for other
front-ends to pass NUL, but at the moment the terminal UI
isn't.

I also suspect that the terminal UI not passing NUL when C-@ is pressed is a bug that will be fixed in the future.

justinmk · 2017-02-28T00:20:18Z

Merged, thanks @hardenedapple

Default Vim behavior of i_CTRL-<Space> is to insert the last-inserted text and exit insert mode. :help i_CTRL-@ Before this commit that did not happen because insert_handle_key() checks for NUL instead of checking for ' ' with a CTRL `mod_mask`. I'm leaving the check for NUL despite the fact that at the moment that key is never seen when using the terminal UI (not for C-Space, nor C-@). This is because I assume it's still allowed for other front-ends to pass NUL, but at the moment the terminal UI isn't.

c0r73x · 2017-02-28T10:48:20Z

It seems that after this PR i'm no longer able to override the C-@ mapping. I'm using it for deoplete manual completion

inoremap <expr><C-@> deoplete#mappings#manual_complete()

Maybe i'm doing something wrong?

justinmk · 2017-02-28T10:50:47Z

C-@ is the same as C-Space.

inoremap <expr><C-Space> deoplete#mappings#manual_complete()

Though maybe @hardenedapple can comment.

c0r73x · 2017-02-28T10:54:03Z

It's strange, because inoremap C-Space works. But inoremap C-@ leaves insert mode.

hardenedapple · 2017-02-28T11:20:42Z

I understand the behaviour, but I don't know why it's only happening after this change, can you check with the commit just before it?

For me, if I check the mappings

inoremap <expr><C-Space> 'hello there'

and

inoremap <expr><C-@> 'hello there'

with nvim -u NONE both before and after this change the <C-Space> mapping works and the <C-@> mapping doesn't.

Mapping <C-@> means that neovim looks for a C-@ character (i.e. NUL), but when pressing Control-Space the terminal UI for neovim sends a space character with the control modifier set (i.e. it sends <C-Space>).

In terminal vim, pressing Control-Space meant a C-@ is processed.

justinmk · 2017-02-28T11:33:35Z

That was my understanding as well. see #5960 (comment) which explains that the observed change in behavior may correspond to a libvterm upgrade.

c0r73x · 2017-02-28T11:52:17Z

Ok my bad, it's not this PR, i tested with 28a6d43 and i'm unable to map C-@ there aswell. So i guess it's because of the libvterm upgrade.

It's not really a problem aslong as C-Space works.

FEATURES: bc4a2e1 help, man.vim: "outline" (TOC) feature neovim#5169 58422f1 'guicursor' works in the TUI (and sends info to UIs) neovim#6423 129f107 api: nvim_get_mode() neovim#6247 0b59f98 api/ui: externalize tabline neovim#6583 bc6d868 'listchars': `Whitespace` highlight group neovim#6367 6afa7d6 writefile() obeys 'fsync' option neovim#6427 c60e409 eval.c refactor (also improves some error messages) neovim#5119 9d200cd getcompletion("cmdline") neovim#6376 2ea7bfc terminal: Support extra arguments in 'shell'. neovim#4504 bf51102 DirChanged autocmd neovim#5928 neovim#6262 1743df8 'cpoptions': "_" flag to toggle `cw` behaviour neovim#6235 22337b1 CTRL-R omits trailing ^M when pasting to cmdline neovim#6137 0e44916 :edit allows unescaped spaces in filename neovim#6119 abdbfd2 eval: Add id() function and make printf("%p") useful neovim#6095 bdfa147 findfile(), :find, gf work in :terminal. neovim#6009 2f38ed1 providers: Disable if `g:loaded_*` exists. b5560a6 setpos() can set lowercase marks in other buffers neovim#5753 7c513d6 Throttle :! output, pulse "..." message. neovim#5396 d2e8c76 v:exiting neovim#5651 :terminal improvements neovim#6185 neovim#6142 - cursor keeps position after leaving insert-mode. - 4ceec30 Follows output only if cursor is at end of buffer. - e7bbd35 new option: 'scrollback' - fedb844 quasi-support for undo and 'modifiable' - b45ddf7 disables 'list' by default - disables 'relativenumber' by default :help now contains full API documentation at `:help api`. man.vim saw numerous improvements. Windows support: - Windows is no longer "experimental", it is fully supported. - Windows package includes a GUI, curl.exe and other utilities. "Vim 8" features: partials, lambdas, packages. FIXES: 12fc1de ops: fix i<c-r> with multi-byte text neovim#6524 dd391bf Windows: system() and friends neovim#6497 13352c0 Windows: os_get_hostname() neovim#6413 16babc6 tui: Less-noisy mouse seqs neovim#6411 3a9dd13 (vim bug) folding edge-cases neovim#6207 f6946c6 job-control: set CLOEXEC on pty processes. neovim#5986 d1afd43 rplugin: Call s:LoadRemotePlugins() on startup. 1215084 backtick-expansion works with `shell=fish` neovim#6224 e32ec03 tui: Improved behavior after resize. neovim#6202 86c2adc edit.c: CTRL-SPC: Insert previously-inserted text. neovim#6090 c318d8e b:changedtick now follows VimL rules neovim#6112 34e24cb terminal: Initialize colors in reverse order neovim#6160 e889917 undo: Don't set b_u_curhead in ex_undojoin() neovim#5869 d25649f undo: :earlier, g-: Set b_u_seq_cur correctly. (neovim#6016) 043d8ba 'Visual-mode put from @. register' neovim#5782 42c922b open_buffer(): Do `BufEnter` for directories. 50d0d89 inccommand: Preview :sub commands only after delimiter neovim#5932 1420e10 CheckHealth improvements neovim#5519 c8d5e92 jobstart(): Return -1 if cmd is not executable. neovim#5671 CHANGES: NVIM_TUI_ENABLE_CURSOR_SHAPE was removed. Use 'guicursor' instead. See https://github.com/neovim/neovim/wiki/Following-HEAD#20170402 81525dc 'mouse=a' is no longer the default. (This will probably change again after it is improved.) neovim#6022 0c1f783 defaults: 'showcmd', 'belloff', 'ruler' neovim#6087 eb0e94f api: {get,set}_option update local options as appropriate neovim#6405 bdcb2a3 "Reading from stdin..." message was removed. neovim#6298

FEATURES: bc4a2e1 help, man.vim: "outline" (TOC) feature neovim#5169 58422f1 'guicursor' works in the TUI (and sends info to UIs) neovim#6423 129f107 api: nvim_get_mode() neovim#6247 0b59f98 api/ui: externalize tabline neovim#6583 bc6d868 'listchars': `Whitespace` highlight group neovim#6367 6afa7d6 writefile() obeys 'fsync' option neovim#6427 c60e409 eval.c refactor (also improves some error messages) neovim#5119 9d200cd getcompletion("cmdline") neovim#6376 2ea7bfc terminal: Support extra arguments in 'shell'. neovim#4504 bf51102 DirChanged autocmd neovim#5928 neovim#6262 1743df8 'cpoptions': "_" flag to toggle `cw` behaviour neovim#6235 22337b1 CTRL-R omits trailing ^M when pasting to cmdline neovim#6137 0e44916 :edit allows unescaped spaces in filename neovim#6119 abdbfd2 eval: Add id() function and make printf("%p") useful neovim#6095 bdfa147 findfile(), :find, gf work in :terminal. neovim#6009 2f38ed1 providers: Disable if `g:loaded_*` exists. b5560a6 setpos() can set lowercase marks in other buffers neovim#5753 7c513d6 Throttle :! output, pulse "..." message. neovim#5396 d2e8c76 v:exiting neovim#5651 :terminal improvements neovim#6185 neovim#6142 - cursor keeps position after leaving insert-mode. - 4ceec30 Follows output only if cursor is at end of buffer. - e7bbd35 new option: 'scrollback' - fedb844 quasi-support for undo and 'modifiable' - b45ddf7 disables 'list' by default - disables 'relativenumber' by default :help now contains full API documentation at `:help api`. man.vim saw numerous improvements. Windows support: - Windows is no longer "experimental", it is fully supported. - Windows package includes a GUI, curl.exe and other utilities. "Vim 8" features: partials, lambdas. SECURITY FIXES: CVE-2017-5953 CVE-2017-6349 CVE-2017-6350 neovim#6485 CHANGES: NVIM_TUI_ENABLE_CURSOR_SHAPE was removed. Use 'guicursor' instead. See https://github.com/neovim/neovim/wiki/Following-HEAD#20170402 81525dc 'mouse=a' is no longer the default. (This will probably change again after it is improved.) neovim#6022 0c1f783 defaults: 'showcmd', 'belloff', 'ruler' neovim#6087 eb0e94f api: {get,set}_option update local options as appropriate neovim#6405 bdcb2a3 "Reading from stdin..." message was removed. neovim#6298 FIXES: 12fc1de ops: fix i<c-r> with multi-byte text neovim#6524 dd391bf Windows: system() and friends neovim#6497 13352c0 Windows: os_get_hostname() neovim#6413 16babc6 tui: Less-noisy mouse seqs neovim#6411 3a9dd13 (vim bug) folding edge-cases neovim#6207 f6946c6 job-control: set CLOEXEC on pty processes. neovim#5986 d1afd43 rplugin: Call s:LoadRemotePlugins() on startup. 1215084 backtick-expansion works with `shell=fish` neovim#6224 e32ec03 tui: Improved behavior after resize. neovim#6202 86c2adc edit.c: CTRL-SPC: Insert previously-inserted text. neovim#6090 c318d8e b:changedtick now follows VimL rules neovim#6112 34e24cb terminal: Initialize colors in reverse order neovim#6160 e889917 undo: Don't set b_u_curhead in ex_undojoin() neovim#5869 d25649f undo: :earlier, g-: Set b_u_seq_cur correctly. (neovim#6016) 043d8ba 'Visual-mode put from @. register' neovim#5782 42c922b open_buffer(): Do `BufEnter` for directories. 50d0d89 inccommand: Preview :sub commands only after delimiter neovim#5932 1420e10 CheckHealth improvements neovim#5519 c8d5e92 jobstart(): Return -1 if cmd is not executable. neovim#5671

justinmk · 2018-04-03T21:33:58Z

src/nvim/edit.c

@@ -844,6 +844,11 @@ static int insert_handle_key(InsertState *s)
    return 0;  // exit insert mode


+  case ' ':
+    if (mod_mask != 4) {


@hardenedapple was there a reason not to use the symbolic form here? E.g.:

if (mod_mask != MOD_MASK_CTRL) {

hardenedapple · 2018-04-04T11:39:09Z

Certainly no reason I can remember. I suspect an oversight on my part.

…

On Tue, 3 Apr 2018, 22:34 Justin M. Keyes, ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In src/nvim/edit.c <#6090 (comment)>: > @@ -844,6 +844,11 @@ static int insert_handle_key(InsertState *s) return 0; // exit insert mode + case ' ': + if (mod_mask != 4) { @hardenedapple <https://github.com/hardenedapple> was there a reason not to use the symbolic form here? E.g.: if (mod_mask != MOD_MASK_CTRL) { — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#6090 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AD4c3Pv_2GAdqgdJ7vvzfeXcb4bJje95ks5tk-rcgaJpZM4L9o14> .

Fix C-Space insert previously inserted text

942332e

hardenedapple force-pushed the insert-ctrl-space branch from 728fe99 to 942332e Compare February 10, 2017 20:53

justinmk closed this Feb 28, 2017

hardenedapple deleted the insert-ctrl-space branch February 28, 2017 11:21

justinmk mentioned this pull request May 1, 2017

NVIM v0.2.0 #6634

Merged

justinmk reviewed Apr 3, 2018

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Fix C-Space insert previously inserted text #6090

Fix C-Space insert previously inserted text #6090

Uh oh!

hardenedapple commented Feb 10, 2017

Uh oh!

justinmk commented Feb 28, 2017

Uh oh!

c0r73x commented Feb 28, 2017

Uh oh!

justinmk commented Feb 28, 2017

Uh oh!

c0r73x commented Feb 28, 2017

Uh oh!

hardenedapple commented Feb 28, 2017

Uh oh!

justinmk commented Feb 28, 2017 •

edited

Loading

Uh oh!

c0r73x commented Feb 28, 2017

Uh oh!

justinmk Apr 3, 2018

Uh oh!

hardenedapple commented Apr 4, 2018 via email

Uh oh!

Uh oh!

Uh oh!

Fix C-Space insert previously inserted text #6090

Fix C-Space insert previously inserted text #6090

Uh oh!

Conversation

hardenedapple commented Feb 10, 2017

Uh oh!

justinmk commented Feb 28, 2017

Uh oh!

c0r73x commented Feb 28, 2017

Uh oh!

justinmk commented Feb 28, 2017

Uh oh!

c0r73x commented Feb 28, 2017

Uh oh!

hardenedapple commented Feb 28, 2017

Uh oh!

justinmk commented Feb 28, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

c0r73x commented Feb 28, 2017

Uh oh!

justinmk Apr 3, 2018

Choose a reason for hiding this comment

Uh oh!

hardenedapple commented Apr 4, 2018 via email

Uh oh!

Uh oh!

justinmk commented Feb 28, 2017 •

edited

Loading