patch 7.4.731
Problem: The tab menu shows "Close tab" even when it doesn't work.
Solution: Don't show "Close tab" for the last tab. (John Marriott)
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 57f264d..eb8c325 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -540,14 +540,17 @@
tabLine_menu = XmCreatePopupMenu(tabLine, "tabline popup", NULL, 0);
/* Add the buttons to the menu */
- n = 0;
- XtSetArg(args[n], XmNuserData, TABLINE_MENU_CLOSE); n++;
- xms = XmStringCreate((char *)"Close tab", STRING_TAG);
- XtSetArg(args[n], XmNlabelString, xms); n++;
- button = XmCreatePushButton(tabLine_menu, "Close", args, n);
- XtAddCallback(button, XmNactivateCallback,
- (XtCallbackProc)tabline_button_cb, NULL);
- XmStringFree(xms);
+ if (first_tabpage->tp_next != NULL)
+ {
+ n = 0;
+ XtSetArg(args[n], XmNuserData, TABLINE_MENU_CLOSE); n++;
+ xms = XmStringCreate((char *)"Close tab", STRING_TAG);
+ XtSetArg(args[n], XmNlabelString, xms); n++;
+ button = XmCreatePushButton(tabLine_menu, "Close", args, n);
+ XtAddCallback(button, XmNactivateCallback,
+ (XtCallbackProc)tabline_button_cb, NULL);
+ XmStringFree(xms);
+ }
n = 0;
XtSetArg(args[n], XmNuserData, TABLINE_MENU_NEW); n++;