]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 7.4.1432 v7.4.1432
authorBram Moolenaar <Bram@vim.org>
Sat, 27 Feb 2016 17:07:44 +0000 (18:07 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 27 Feb 2016 17:07:44 +0000 (18:07 +0100)
Problem:    Typo in button text.
Solution:   Fix the typo. (Dominique Pelle)

src/gui_gtk.c
src/version.c

index 6decec0df3c8ad7692be1f1dc6b8db39bbcab735..55d10002a9c7bbe85da1ef078da78ca8b270b607 100644 (file)
@@ -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;
index f54913eabe298be7a48e441e508baa3f28dec4b3..5ae9179d5851a174f931e30eac1900f6892d5a9c 100644 (file)
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1432,
 /**/
     1431,
 /**/