diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-06-20 09:40:11 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-06-20 09:40:11 +0000 |
| commit | 4678465a4b117d36015bd62860e19abb02d243af (patch) | |
| tree | 2874c73c50f4afc991ab815294465041e16445f7 /src | |
| parent | 7c94c26fb27d0faf89a3f893a6eb99ae3af1e8d3 (diff) | |
| download | vim-4678465a4b117d36015bd62860e19abb02d243af.zip | |
updated for version 7.1-317
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_motif.c | 20 | ||||
| -rw-r--r-- | src/testdir/test65.in | 0 | ||||
| -rw-r--r-- | src/testdir/test65.ok | 0 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c index 6060b585c..8285b1674 100644 --- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -686,8 +686,8 @@ manage_centered(dialog_child) /* Temporarily set value of XmNmappedWhenManaged to stop the dialog from popping up right away */ - XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, 0); - XtVaSetValues(shell, XmNmappedWhenManaged, False, 0); + XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, NULL); + XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL); XtManageChild(dialog_child); @@ -723,7 +723,7 @@ manage_centered(dialog_child) XtMapWidget(shell); /* Restore the value of XmNmappedWhenManaged */ - XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, 0); + XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, NULL); } #if defined(FEAT_MENU) || defined(FEAT_SUN_WORKSHOP) \ @@ -1993,7 +1993,7 @@ do_mnemonic(Widget w, unsigned int keycode) { if (XtClass(w) == xmRowColumnWidgetClass) { - XtVaGetValues(w, XmNrowColumnType, &rowColType, 0); + XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL); isMenu = (rowColType != (unsigned char)XmWORK_AREA); } else @@ -2001,14 +2001,14 @@ do_mnemonic(Widget w, unsigned int keycode) if (!isMenu) { XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, - &numChildren, 0); + &numChildren, NULL); for (i = 0; i < numChildren; i++) do_mnemonic(children[i], keycode); } } else { - XtVaGetValues(w, XmNmnemonic, &mnemonic, 0); + XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL); if (mnemonic != '\0') { mneString[0] = mnemonic; @@ -2019,7 +2019,7 @@ do_mnemonic(Widget w, unsigned int keycode) if (XtClass(w) == xmLabelWidgetClass || XtClass(w) == xmLabelGadgetClass) { - XtVaGetValues(w, XmNuserData, &userData, 0); + XtVaGetValues(w, XmNuserData, &userData, NULL); if (userData != NULL && XtIsWidget(userData)) XmProcessTraversal(userData, XmTRAVERSE_CURRENT); } @@ -2073,7 +2073,7 @@ add_mnemonic_grabs(Widget dialog, Widget w) { if (XtClass(w) == xmRowColumnWidgetClass) { - XtVaGetValues(w, XmNrowColumnType, &rowColType, 0); + XtVaGetValues(w, XmNrowColumnType, &rowColType, NULL); isMenu = (rowColType != (unsigned char)XmWORK_AREA); } else @@ -2081,14 +2081,14 @@ add_mnemonic_grabs(Widget dialog, Widget w) if (!isMenu) { XtVaGetValues(w, XmNchildren, &children, XmNnumChildren, - &numChildren, 0); + &numChildren, NULL); for (i = 0; i < numChildren; i++) add_mnemonic_grabs(dialog, children[i]); } } else { - XtVaGetValues(w, XmNmnemonic, &mnemonic, 0); + XtVaGetValues(w, XmNmnemonic, &mnemonic, NULL); if (mnemonic != '\0') { mneString[0] = mnemonic; diff --git a/src/testdir/test65.in b/src/testdir/test65.in new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/testdir/test65.in diff --git a/src/testdir/test65.ok b/src/testdir/test65.ok new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/testdir/test65.ok diff --git a/src/version.c b/src/version.c index fbde4b469..508d8478d 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 317, +/**/ 316, /**/ 315, |