aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
authorPaul Eggert2014-02-04 11:24:09 -0800
committerPaul Eggert2014-02-04 11:24:09 -0800
commit8e5917ecb306bcf783ea2e432544ecd4e8ec3309 (patch)
tree4aa4b60e62e98c7bae4b5ba622415456b6093e2a /src/menu.c
parent08e41897364aecbfb4c275d3c3c0cd5acbd08cc9 (diff)
downloademacs-8e5917ecb306bcf783ea2e432544ecd4e8ec3309.tar.gz
emacs-8e5917ecb306bcf783ea2e432544ecd4e8ec3309.zip
* menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'.
It prompted a compile-time diagnostic on GNU/Linux. Simplify to remove the need for the label.
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/menu.c b/src/menu.c
index 47ebc922b84..9c08ff17665 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1561,26 +1561,23 @@ for instance using the window manager, then this produces a quit and
1561 Do this before creating the widget value that points to Lisp 1561 Do this before creating the widget value that points to Lisp
1562 string contents, because Fredisplay may GC and relocate them. */ 1562 string contents, because Fredisplay may GC and relocate them. */
1563 Fredisplay (Qt); 1563 Fredisplay (Qt);
1564#if defined (USE_X_TOOLKIT) || defined (USE_GTK) 1564
1565#if defined USE_X_TOOLKIT || defined USE_GTK
1565 if (FRAME_WINDOW_P (f)) 1566 if (FRAME_WINDOW_P (f))
1566 return xw_popup_dialog (f, header, contents); 1567 return xw_popup_dialog (f, header, contents);
1567 else
1568#endif 1568#endif
1569#if defined (HAVE_NTGUI) 1569#ifdef HAVE_NTGUI
1570 if (FRAME_W32_P (f)) 1570 if (FRAME_W32_P (f))
1571 { 1571 {
1572 Lisp_Object selection = w32_popup_dialog (f, header, contents); 1572 Lisp_Object selection = w32_popup_dialog (f, header, contents);
1573 1573
1574 if (!EQ (selection, Qunsupported__w32_dialog)) 1574 if (!EQ (selection, Qunsupported__w32_dialog))
1575 return selection; 1575 return selection;
1576 goto dialog_via_menu;
1577 } 1576 }
1578 else
1579#endif 1577#endif
1580#ifdef HAVE_NS 1578#ifdef HAVE_NS
1581 if (FRAME_NS_P (f)) 1579 if (FRAME_NS_P (f))
1582 return ns_popup_dialog (position, header, contents); 1580 return ns_popup_dialog (position, header, contents);
1583 else
1584#endif 1581#endif
1585 /* Display a menu with these alternatives 1582 /* Display a menu with these alternatives
1586 in the middle of frame F. */ 1583 in the middle of frame F. */
@@ -1588,8 +1585,6 @@ for instance using the window manager, then this produces a quit and
1588 Lisp_Object x, y, frame, newpos, prompt; 1585 Lisp_Object x, y, frame, newpos, prompt;
1589 int x_coord, y_coord; 1586 int x_coord, y_coord;
1590 1587
1591 dialog_via_menu:
1592
1593 prompt = Fcar (contents); 1588 prompt = Fcar (contents);
1594 if (FRAME_WINDOW_P (f)) 1589 if (FRAME_WINDOW_P (f))
1595 { 1590 {