* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5bba143826f9c8f89bee8deb1565579d6b6a6e67..1ef4d9fc8164382bad781bd0f18e7318e8a2b515 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * 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.
+
 2014-02-04  Eli Zaretskii  <eliz@gnu.org>
 
        * w32menu.c (w32_popup_dialog): Don't condition the whole function

diff --git a/src/menu.c b/src/menu.c
index 47ebc922b84f3201becea5d839751e25e3b363d8..9c08ff176652beab14f519f59ecbf0633cdb5381 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -1561,26 +1561,23 @@ for instance using the window manager, then this produces a quit and
      Do this before creating the widget value that points to Lisp
      string contents, because Fredisplay may GC and relocate them.  */
   Fredisplay (Qt);
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK)
+
+#if defined USE_X_TOOLKIT || defined USE_GTK
   if (FRAME_WINDOW_P (f))
     return xw_popup_dialog (f, header, contents);
-  else
 #endif
-#if defined (HAVE_NTGUI)
+#ifdef HAVE_NTGUI
   if (FRAME_W32_P (f))
     {
       Lisp_Object selection = w32_popup_dialog (f, header, contents);
 
       if (!EQ (selection, Qunsupported__w32_dialog))
        return selection;
-      goto dialog_via_menu;
     }
-  else
 #endif
 #ifdef HAVE_NS
   if (FRAME_NS_P (f))
     return ns_popup_dialog (position, header, contents);
-  else
 #endif
   /* Display a menu with these alternatives
      in the middle of frame F.  */
@@ -1588,8 +1585,6 @@ for instance using the window manager, then this produces a quit and
     Lisp_Object x, y, frame, newpos, prompt;
     int x_coord, y_coord;
 
-  dialog_via_menu:
-
     prompt = Fcar (contents);
     if (FRAME_WINDOW_P (f))
       {