Mercurial > emacs
comparison src/xmenu.c @ 83010:82554ed1aed8
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-22
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-23
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-24
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-25
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-26
Fix permission bogosities
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-27
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-28
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-29
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-30
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-50
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 10 Jan 2004 13:27:38 +0000 |
parents | 7900111db01c ed3e26153ee9 |
children | 4c6128c0d7e2 |
comparison
equal
deleted
inserted
replaced
83009:b2b37c85b00a | 83010:82554ed1aed8 |
---|---|
1090 /* Decode the dialog items from what was specified. */ | 1090 /* Decode the dialog items from what was specified. */ |
1091 title = Fcar (contents); | 1091 title = Fcar (contents); |
1092 CHECK_STRING (title); | 1092 CHECK_STRING (title); |
1093 record_unwind_protect (unuse_menu_items, Qnil); | 1093 record_unwind_protect (unuse_menu_items, Qnil); |
1094 | 1094 |
1095 if (NILP (Fcar (Fcdr (contents)))) | |
1096 /* No buttons specified, add an "Ok" button so users can pop down | |
1097 the dialog. Also, the lesstif/motif version crashes if there are | |
1098 no buttons. */ | |
1099 contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil)); | |
1100 | |
1095 list_of_panes (Fcons (contents, Qnil)); | 1101 list_of_panes (Fcons (contents, Qnil)); |
1096 | 1102 |
1097 /* Display them in a dialog box. */ | 1103 /* Display them in a dialog box. */ |
1098 BLOCK_INPUT; | 1104 BLOCK_INPUT; |
1099 selection = xdialog_show (f, 0, title, &error_name); | 1105 selection = xdialog_show (f, 0, title, &error_name); |