[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117260: src/menu.c (Fx_popup_dialog): Comment the u
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r117260: src/menu.c (Fx_popup_dialog): Comment the use of Qunsupported__w32_dialog. |
Date: |
Wed, 04 Jun 2014 15:17:03 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117260
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2014-06-04 18:16:54 +0300
message:
src/menu.c (Fx_popup_dialog): Comment the use of Qunsupported__w32_dialog.
modified:
src/menu.c menu.c-20091113204419-o5vbwnq5f7feedwu-8676
=== modified file 'src/menu.c'
--- a/src/menu.c 2014-06-04 14:59:09 +0000
+++ b/src/menu.c 2014-06-04 15:16:54 +0000
@@ -1434,7 +1434,7 @@
return selection;
}
-/* If F's terminal is not capable to display popup dialog,
+/* If F's terminal is not capable of displaying a popup dialog,
emulate it with a menu. */
static Lisp_Object
@@ -1457,7 +1457,7 @@
x_coord -= SCHARS (prompt);
y_coord = FRAME_LINES (f);
}
-
+
XSETFRAME (frame, f);
XSETINT (x, x_coord / 2);
XSETINT (y, y_coord / 2);
@@ -1546,9 +1546,12 @@
Lisp_Object selection
= FRAME_TERMINAL (f)->popup_dialog_hook (f, header, contents);
#ifdef HAVE_NTGUI
+ /* NTGUI supports only simple dialogs with Yes/No choices. For
+ other dialogs, it returns the symbol 'unsupported--w32-dialog',
+ as a signal for the caller to fall back to the emulation code. */
if (!EQ (selection, Qunsupported__w32_dialog))
-#endif
- return selection;
+#endif
+ return selection;
}
/* ... or emulate it with a menu. */
return emulate_dialog_with_menu (f, contents);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117260: src/menu.c (Fx_popup_dialog): Comment the use of Qunsupported__w32_dialog.,
Eli Zaretskii <=