diff options
| author | Miles Bader | 2007-05-01 23:03:36 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-05-01 23:03:36 +0000 |
| commit | 212c766631c7de92e9dde63d842c5e16338dbaf0 (patch) | |
| tree | 79ba5b940ed2b366b3f19d35c52fe4ecd5742d78 /src/macmenu.c | |
| parent | 59c92ade0ab7972baabbe04866922575c98a0f48 (diff) | |
| parent | 6c60609353d509d8c4e0bb2cb5bd3119ca7f153c (diff) | |
| download | emacs-212c766631c7de92e9dde63d842c5e16338dbaf0.tar.gz emacs-212c766631c7de92e9dde63d842c5e16338dbaf0.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 713-725)
- Update from CVS
- Merge from emacs--rel--22
- Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change.
- Merge from gnus--rel--5.10
* emacs--rel--22 (base, patch 1-5)
- tag of emacs@sv.gnu.org/emacs--devo--0--patch-709
- Sync to CVS tag EMACS_22_BRANCHPOINT
- Sync to CVS branch EMACS_22_BASE
- Update from CVS
* gnus--rel--5.10 (patch 217)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-202
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index c7a84df7106..a5196a156eb 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -1011,6 +1011,11 @@ for instance using the window manager, then this produces a quit and | |||
| 1011 | DialogItemIndex item_hit; | 1011 | DialogItemIndex item_hit; |
| 1012 | Lisp_Object tem; | 1012 | Lisp_Object tem; |
| 1013 | 1013 | ||
| 1014 | /* Force a redisplay before showing the dialog. If a frame is | ||
| 1015 | created just before showing the dialog, its contents may not | ||
| 1016 | have been fully drawn. */ | ||
| 1017 | Fredisplay (Qt); | ||
| 1018 | |||
| 1014 | tem = Fstring_match (concat3 (build_string ("\\("), | 1019 | tem = Fstring_match (concat3 (build_string ("\\("), |
| 1015 | call0 (intern ("sentence-end")), | 1020 | call0 (intern ("sentence-end")), |
| 1016 | build_string ("\\)\n")), | 1021 | build_string ("\\)\n")), |
| @@ -2943,6 +2948,11 @@ mac_dialog_show (f, keymaps, title, header, error_name) | |||
| 2943 | first_wv = wv; | 2948 | first_wv = wv; |
| 2944 | } | 2949 | } |
| 2945 | 2950 | ||
| 2951 | /* Force a redisplay before showing the dialog. If a frame is created | ||
| 2952 | just before showing the dialog, its contents may not have been fully | ||
| 2953 | drawn. */ | ||
| 2954 | Fredisplay (Qt); | ||
| 2955 | |||
| 2946 | /* Actually create the dialog. */ | 2956 | /* Actually create the dialog. */ |
| 2947 | #if TARGET_API_MAC_CARBON | 2957 | #if TARGET_API_MAC_CARBON |
| 2948 | menu_item_selection = create_and_show_dialog (f, first_wv); | 2958 | menu_item_selection = create_and_show_dialog (f, first_wv); |