[Emacs-diffs] trunk r116263: * menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'.

[Paul Eggert]

------------------------------------------------------------
revno: 116263
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-04 11:24:09 -0800
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/menu.c                     menu.c-20091113204419-o5vbwnq5f7feedwu-8676

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-04 16:13:51 +0000
+++ b/src/ChangeLog     2014-02-04 19:24:09 +0000
@@ -1,3 +1,9 @@
+2014-02-04  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * w32menu.c (w32_popup_dialog): Don't condition the whole function

=== modified file 'src/menu.c'
--- a/src/menu.c        2014-02-04 16:13:51 +0000
+++ b/src/menu.c        2014-02-04 19:24:09 +0000
@@ -1561,26 +1561,23 @@
      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 @@
     Lisp_Object x, y, frame, newpos, prompt;
     int x_coord, y_coord;
 
-  dialog_via_menu:
-
     prompt = Fcar (contents);
     if (FRAME_WINDOW_P (f))
       {