summaryrefslogtreecommitdiff
path: root/src/fns.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-03-23 18:18:19 +0000
committerRichard M. Stallman <rms@gnu.org>1994-03-23 18:18:19 +0000
commit035ed5d6971942612d6f10ac3af38d3e6418f70b (patch)
tree6a4d9859d0597843c1370d9ec148bec1c94f72cd /src/fns.c
parent2cb23303205ecb5ad2b54be7da9afb63dd840b09 (diff)
downloademacs-035ed5d6971942612d6f10ac3af38d3e6418f70b.tar.gz
(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.
Diffstat (limited to 'src/fns.c')
-rw-r--r--src/fns.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/fns.c b/src/fns.c
index f1951ae1f94..fbed621b276 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;
}