Mercurial > emacs
comparison src/fns.c @ 90185:5b029ff3b08d
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 26 May 2005 05:42:19 +0000 |
parents | 08185296b491 100b8f001349 |
children | 01137c1fdbe9 |
comparison
equal
deleted
inserted
replaced
90184:9e5e2f01c7ab | 90185:5b029ff3b08d |
---|---|
2627 redisplay_preserve_echo_area (3); | 2627 redisplay_preserve_echo_area (3); |
2628 pane = Fcons (Fcons (build_string ("Yes"), Qt), | 2628 pane = Fcons (Fcons (build_string ("Yes"), Qt), |
2629 Fcons (Fcons (build_string ("No"), Qnil), | 2629 Fcons (Fcons (build_string ("No"), Qnil), |
2630 Qnil)); | 2630 Qnil)); |
2631 menu = Fcons (prompt, pane); | 2631 menu = Fcons (prompt, pane); |
2632 obj = Fx_popup_dialog (Qt, menu); | 2632 obj = Fx_popup_dialog (Qt, menu, Qnil); |
2633 answer = !NILP (obj); | 2633 answer = !NILP (obj); |
2634 break; | 2634 break; |
2635 } | 2635 } |
2636 #endif /* HAVE_MENUS */ | 2636 #endif /* HAVE_MENUS */ |
2637 cursor_in_echo_area = 1; | 2637 cursor_in_echo_area = 1; |
2759 pane = Fcons (Fcons (build_string ("Yes"), Qt), | 2759 pane = Fcons (Fcons (build_string ("Yes"), Qt), |
2760 Fcons (Fcons (build_string ("No"), Qnil), | 2760 Fcons (Fcons (build_string ("No"), Qnil), |
2761 Qnil)); | 2761 Qnil)); |
2762 GCPRO1 (pane); | 2762 GCPRO1 (pane); |
2763 menu = Fcons (prompt, pane); | 2763 menu = Fcons (prompt, pane); |
2764 obj = Fx_popup_dialog (Qt, menu); | 2764 obj = Fx_popup_dialog (Qt, menu, Qnil); |
2765 UNGCPRO; | 2765 UNGCPRO; |
2766 return obj; | 2766 return obj; |
2767 } | 2767 } |
2768 #endif /* HAVE_MENUS */ | 2768 #endif /* HAVE_MENUS */ |
2769 | 2769 |