Commit ec26e1b9 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Fy_or_n_p, Fyes_or_no_p): Call Fx_popup_dialog the new way.

(Fyes_or_no_p): Always display just one dialog box
whether or not USE_X_TOOLKIT.
parent 84f6bcba
......@@ -1136,7 +1136,7 @@ Also accepts Space to mean yes, or Delete to mean no.")
pane = Fcons (Fcons (build_string ("Yes"), Qt),
Fcons (Fcons (build_string ("No"), Qnil),
Qnil));
menu = Fcons (prompt, Fcons (Fcons (prompt, pane), Qnil));
menu = Fcons (prompt, pane);
obj = Fx_popup_dialog (Qt, menu);
answer = !NILP (obj);
break;
......@@ -1239,16 +1239,8 @@ and can edit it until it as been confirmed.")
Fcons (Fcons (build_string ("No"), Qnil),
Qnil));
GCPRO1 (pane);
menu = Fcons (prompt, Fcons (Fcons (prompt, pane), Qnil));
menu = Fcons (prompt, pane);
obj = Fx_popup_dialog (Qt, menu);
#ifndef USE_X_TOOLKIT
if (!NILP (obj))
{
prompt = build_string ("Confirm");
menu = Fcons (prompt, Fcons (Fcons (prompt, pane), Qnil));
obj = Fx_popup_dialog (Qt, menu);
}
#endif
UNGCPRO;
return obj;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment