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

1 files changed, 2 insertions, 10 deletions

diff --git a/src/fns.c b/src/fns.c
index f1951ae1f9..fbed621b27 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -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;
     }