aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_getln.c
diff options
context:
space:
mode:
authorwatiko <service@mail.watiko.net>2016-02-23 03:01:30 +0900
committerwatiko <service@mail.watiko.net>2016-03-06 00:03:46 +0900
commit3d9e9a92cf292dac807c69e3c046b288df0dfb00 (patch)
tree00f8beaf47decc6fa44a48979f21b9585d421a82 /src/nvim/ex_getln.c
parent43456e43de9cb31775711fb01c5a6bcde16fa23d (diff)
downloadrneovim-3d9e9a92cf292dac807c69e3c046b288df0dfb00.tar.gz
rneovim-3d9e9a92cf292dac807c69e3c046b288df0dfb00.tar.bz2
rneovim-3d9e9a92cf292dac807c69e3c046b288df0dfb00.zip
vim-patch:7.4.973
Problem: When pasting on the command line line breaks result in literal <CR> characters. This makes pasting a long file name difficult. Solution: Skip the characters. https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Diffstat (limited to 'src/nvim/ex_getln.c')
-rw-r--r--src/nvim/ex_getln.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 2013e73e27..cffda1ca55 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -2424,20 +2424,17 @@ void restore_cmdline_alloc(char_u *p)
xfree(p);
}
-/*
- * paste a yank register into the command line.
- * used by CTRL-R command in command-line mode
- * insert_reg() can't be used here, because special characters from the
- * register contents will be interpreted as commands.
- *
- * return FAIL for failure, OK otherwise
- */
-static int
-cmdline_paste (
- int regname,
- int literally, /* Insert text literally instead of "as typed" */
- int remcr /* remove trailing CR */
-)
+/// Paste a yank register into the command line.
+/// Used by CTRL-R command in command-line mode.
+/// insert_reg() can't be used here, because special characters from the
+/// register contents will be interpreted as commands.
+///
+/// @param regname Register name.
+/// @param literally Insert text literally instead of "as typed".
+/// @param remcr When true, remove trailing CR.
+///
+/// @returns FAIL for failure, OK otherwise
+static bool cmdline_paste(int regname, bool literally, bool remcr)
{
long i;
char_u *arg;