diff options
| author | Jan Djärv | 2004-01-08 21:04:32 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-01-08 21:04:32 +0000 |
| commit | 160b1b50f97a0a020c40eda4762e2d7e06c11df9 (patch) | |
| tree | 683ecf15a10045d3c31ad9098d7126119dcf47d5 /src | |
| parent | 152b6e830f5213943afbb70be0e91a022f63556f (diff) | |
| download | emacs-160b1b50f97a0a020c40eda4762e2d7e06c11df9.tar.gz emacs-160b1b50f97a0a020c40eda4762e2d7e06c11df9.zip | |
* xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
specified.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xmenu.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 44d922a254e..27c76179e57 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-01-08 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are | ||
| 4 | specified. | ||
| 5 | |||
| 1 | 2004-01-08 Kenichi Handa <handa@m17n.org> | 6 | 2004-01-08 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * editfns.c (Fformat): Fix '&' to '&&'. | 8 | * editfns.c (Fformat): Fix '&' to '&&'. |
diff --git a/src/xmenu.c b/src/xmenu.c index 669d8177c15..439f5002dde 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1092,6 +1092,12 @@ on the left of the dialog box and all following items on the right. | |||
| 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. */ |