diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/macfns.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/macfns.c b/src/macfns.c index 95356e5edf4..7b8c261f1f0 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -2829,26 +2829,22 @@ FRAME nil means use the selected frame. */) | |||
| 2829 | Lisp_Object frame; | 2829 | Lisp_Object frame; |
| 2830 | { | 2830 | { |
| 2831 | struct frame *f = check_x_frame (frame); | 2831 | struct frame *f = check_x_frame (frame); |
| 2832 | struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f); | ||
| 2833 | 2832 | ||
| 2834 | if (dpyinfo->x_focus_frame != f) | 2833 | BLOCK_INPUT; |
| 2835 | { | ||
| 2836 | BLOCK_INPUT; | ||
| 2837 | #ifdef MAC_OSX | 2834 | #ifdef MAC_OSX |
| 2838 | ActivateWindow (ActiveNonFloatingWindow (), false); | 2835 | ActivateWindow (ActiveNonFloatingWindow (), false); |
| 2839 | ActivateWindow (FRAME_MAC_WINDOW (f), true); | 2836 | ActivateWindow (FRAME_MAC_WINDOW (f), true); |
| 2840 | #else | 2837 | #else |
| 2841 | #if !TARGET_API_MAC_CARBON | 2838 | #if !TARGET_API_MAC_CARBON |
| 2842 | /* SelectWindow (Non-Carbon) does not issue deactivate events if | 2839 | /* SelectWindow (Non-Carbon) does not issue deactivate events if the |
| 2843 | the possibly inactive window that is to be selected is | 2840 | possibly inactive window that is to be selected is already the |
| 2844 | already the frontmost one. */ | 2841 | frontmost one. */ |
| 2845 | SendBehind (FRAME_MAC_WINDOW (f), NULL); | 2842 | SendBehind (FRAME_MAC_WINDOW (f), NULL); |
| 2846 | #endif | 2843 | #endif |
| 2847 | /* This brings the window to the front. */ | 2844 | /* This brings the window to the front. */ |
| 2848 | SelectWindow (FRAME_MAC_WINDOW (f)); | 2845 | SelectWindow (FRAME_MAC_WINDOW (f)); |
| 2849 | #endif | 2846 | #endif |
| 2850 | UNBLOCK_INPUT; | 2847 | UNBLOCK_INPUT; |
| 2851 | } | ||
| 2852 | 2848 | ||
| 2853 | return Qnil; | 2849 | return Qnil; |
| 2854 | } | 2850 | } |