Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

* menu.c (Fx_popup_dialog): Remove label 'dialog_via_menu'.

Browse source 
It prompted a compile-time diagnostic on GNU/Linux.
Simplify to remove the need for the label.
This commit is contained in:
Paul Eggert 2014-02-04 11:24:09 -08:00
parent 08e4189736
commit 8e5917ecb3
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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

11
src/menu.c
View file

@ -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))
{