summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-27 18:07:44 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-27 18:07:44 +0100
commit4d1961783fdcb133b6b181acb7166b9f1872bf09 (patch)
treed5756b555f6f75b626c1f0439e8736ba399ee9ee /src
parent9e24f0c5c1b1097295d0619d95da66e6b2d83ac9 (diff)
downloadvim-git-4d1961783fdcb133b6b181acb7166b9f1872bf09.tar.gz
patch 7.4.1432v7.4.1432
Problem: Typo in button text. Solution: Fix the typo. (Dominique Pelle)
Diffstat (limited to 'src')
-rw-r--r--src/gui_gtk.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 6decec0df..55d10002a 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1661,7 +1661,7 @@ dialog_add_buttons(GtkDialog *dialog, char_u *button_string)
else if (button_equal(label, "Ok")) label = _("OK");
else if (button_equal(label, "Yes")) label = _("Yes");
else if (button_equal(label, "No")) label = _("No");
- else if (button_equal(label, "Cancel")) label = _("Canccl");
+ else if (button_equal(label, "Cancel")) label = _("Cancel");
# else
if (button_equal(label, ok[0])) label = GTK_STOCK_OK;
else if (button_equal(label, ync[0])) label = GTK_STOCK_YES;
diff --git a/src/version.c b/src/version.c
index f54913eab..5ae9179d5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1432,
+/**/
1431,
/**/
1430,