aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/globals.h
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-12-16 14:27:41 +0300
committerZyX <kp-pav@yandex.ru>2017-12-16 14:27:41 +0300
commit7f3b9a4acc503709c89a501aaee304ff208bd995 (patch)
tree73e2d477fc8664ccaffad9dbc000132c7fa82857 /src/nvim/globals.h
parent76ffe0c5aa51fe4fe14811e86867af2c711190a1 (diff)
parent7afd26a6d189d1ca798f93db8661bd656a37265f (diff)
downloadrneovim-7f3b9a4acc503709c89a501aaee304ff208bd995.tar.gz
rneovim-7f3b9a4acc503709c89a501aaee304ff208bd995.tar.bz2
rneovim-7f3b9a4acc503709c89a501aaee304ff208bd995.zip
Merge branch 'master' into hide-container-impl
Diffstat (limited to 'src/nvim/globals.h')
-rw-r--r--src/nvim/globals.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index ef56954aa0..dd216f177f 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1043,6 +1043,7 @@ EXTERN char_u e_for[] INIT(= N_("E588: :endfor without :for"));
EXTERN char_u e_exists[] INIT(= N_("E13: File exists (add ! to override)"));
EXTERN char_u e_failed[] INIT(= N_("E472: Command failed"));
EXTERN char_u e_internal[] INIT(= N_("E473: Internal error"));
+EXTERN char_u e_intern2[] INIT(= N_("E685: Internal error: %s"));
EXTERN char_u e_interr[] INIT(= N_("Interrupted"));
EXTERN char_u e_invaddr[] INIT(= N_("E14: Invalid address"));
EXTERN char_u e_invarg[] INIT(= N_("E474: Invalid argument"));
@@ -1134,7 +1135,6 @@ EXTERN char_u e_write[] INIT(= N_("E80: Error while writing"));
EXTERN char_u e_zerocount[] INIT(= N_("E939: Positive count required"));
EXTERN char_u e_usingsid[] INIT(= N_(
"E81: Using <SID> not in a script context"));
-EXTERN char_u e_intern2[] INIT(= N_("E685: Internal error: %s"));
EXTERN char_u e_maxmempat[] INIT(= N_(
"E363: pattern uses more memory than 'maxmempattern'"));
EXTERN char_u e_emptybuf[] INIT(= N_("E749: empty buffer"));