Mercurial > emacs
comparison src/fns.c @ 6478:65c2e184b5d9
(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.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Wed, 23 Mar 1994 18:18:19 +0000 |
parents | a4bf4dba3ace |
children | d2d8b40fb599 |
comparison
equal
deleted
inserted
replaced
6477:95a4c1f81d0c | 6478:65c2e184b5d9 |
---|---|
1134 { | 1134 { |
1135 Lisp_Object pane, menu; | 1135 Lisp_Object pane, menu; |
1136 pane = Fcons (Fcons (build_string ("Yes"), Qt), | 1136 pane = Fcons (Fcons (build_string ("Yes"), Qt), |
1137 Fcons (Fcons (build_string ("No"), Qnil), | 1137 Fcons (Fcons (build_string ("No"), Qnil), |
1138 Qnil)); | 1138 Qnil)); |
1139 menu = Fcons (prompt, Fcons (Fcons (prompt, pane), Qnil)); | 1139 menu = Fcons (prompt, pane); |
1140 obj = Fx_popup_dialog (Qt, menu); | 1140 obj = Fx_popup_dialog (Qt, menu); |
1141 answer = !NILP (obj); | 1141 answer = !NILP (obj); |
1142 break; | 1142 break; |
1143 } | 1143 } |
1144 else | 1144 else |
1237 Lisp_Object pane, menu, obj; | 1237 Lisp_Object pane, menu, obj; |
1238 pane = Fcons (Fcons (build_string ("Yes"), Qt), | 1238 pane = Fcons (Fcons (build_string ("Yes"), Qt), |
1239 Fcons (Fcons (build_string ("No"), Qnil), | 1239 Fcons (Fcons (build_string ("No"), Qnil), |
1240 Qnil)); | 1240 Qnil)); |
1241 GCPRO1 (pane); | 1241 GCPRO1 (pane); |
1242 menu = Fcons (prompt, Fcons (Fcons (prompt, pane), Qnil)); | 1242 menu = Fcons (prompt, pane); |
1243 obj = Fx_popup_dialog (Qt, menu); | 1243 obj = Fx_popup_dialog (Qt, menu); |
1244 #ifndef USE_X_TOOLKIT | |
1245 if (!NILP (obj)) | |
1246 { | |
1247 prompt = build_string ("Confirm"); | |
1248 menu = Fcons (prompt, Fcons (Fcons (prompt, pane), Qnil)); | |
1249 obj = Fx_popup_dialog (Qt, menu); | |
1250 } | |
1251 #endif | |
1252 UNGCPRO; | 1244 UNGCPRO; |
1253 return obj; | 1245 return obj; |
1254 } | 1246 } |
1255 | 1247 |
1256 args[0] = prompt; | 1248 args[0] = prompt; |