aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKunMing Xie <qqzz014@gmail.com>2017-09-18 02:05:22 +0800
committerJustin M. Keyes <justinkz@gmail.com>2017-09-17 20:05:22 +0200
commit12efbf897de28f00523885ceb99fb7cf41ed82e6 (patch)
treedea703fa642f61a09a07c710784abed8e6ab66a3 /src
parentcf59d617bc6d2aabb487c4d6be8082160a633a39 (diff)
downloadrneovim-12efbf897de28f00523885ceb99fb7cf41ed82e6.tar.gz
rneovim-12efbf897de28f00523885ceb99fb7cf41ed82e6.tar.bz2
rneovim-12efbf897de28f00523885ceb99fb7cf41ed82e6.zip
vim-patch:8.0.0327 (#7281)
Problem: The E11 error message in the command line window is not translated. Solution: use _(). (Hirohito Higashi) https://github.com/vim/vim/commit/75c19464ed7fb6024af64747379e61abc4e4a483
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_docmd.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index bef5fd287e..f9442a4cf6 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1813,7 +1813,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
if (text_locked() && !(ea.argt & CMDWIN)
&& !IS_USER_CMDIDX(ea.cmdidx)) {
// Command not allowed when editing the command line.
- errormsg = get_text_locked_msg();
+ errormsg = (char_u *)_(get_text_locked_msg());
goto doend;
}
/* Disallow editing another buffer when "curbuf_lock" is set.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1f040b214b..675ebb17b0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -625,7 +625,7 @@ static const int included_patches[] = {
// 330,
// 329,
// 328,
- // 327,
+ 327,
326,
325,
324,