diff options
| author | Adrian Robert | 2009-02-20 11:39:30 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-02-20 11:39:30 +0000 |
| commit | 52f8870bd7b8508449605a33840bfddc2ea98a2b (patch) | |
| tree | cc91ae839d7e6437b0e7a2eb99e5733557d5de30 /src | |
| parent | 9148fdd002c311e24adb73574447070baed4536b (diff) | |
| download | emacs-52f8870bd7b8508449605a33840bfddc2ea98a2b.tar.gz emacs-52f8870bd7b8508449605a33840bfddc2ea98a2b.zip | |
* nsterm.m (x_make_frame_invisible): Unset async_visible,
async_iconified. Based on a patch by Christian Lynbech
<christian.lynbech@tieto.com>.
(EmacsView-windowDidMiniaturize:): Unset async_visible.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/nsterm.m | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d7ab53246ec..89df449c281 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2009-02-20 Adrian Robert <Adrian.B.Robert@gmail.com> | ||
| 2 | |||
| 3 | * nsterm.m (x_make_frame_invisible): Unset async_visible, | ||
| 4 | async_iconified. Based on a patch by Christian Lynbech | ||
| 5 | <christian.lynbech@tieto.com>. | ||
| 6 | (EmacsView-windowDidMiniaturize:): Unset async_visible. | ||
| 7 | |||
| 1 | 2009-02-20 Glenn Morris <rgm@gnu.org> | 8 | 2009-02-20 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * syntax.c (Fskip_chars_forward): Fix doc typo. | 10 | * syntax.c (Fskip_chars_forward): Fix doc typo. |
diff --git a/src/nsterm.m b/src/nsterm.m index b674edae580..b8639834e57 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -1001,6 +1001,8 @@ x_make_frame_invisible (struct frame *f) | |||
| 1001 | NSTRACE (x_make_frame_invisible); | 1001 | NSTRACE (x_make_frame_invisible); |
| 1002 | check_ns (); | 1002 | check_ns (); |
| 1003 | [[view window] orderOut: NSApp]; | 1003 | [[view window] orderOut: NSApp]; |
| 1004 | f->async_visible = 0; | ||
| 1005 | f->async_iconified = 0; | ||
| 1004 | } | 1006 | } |
| 1005 | 1007 | ||
| 1006 | 1008 | ||
| @@ -5308,8 +5310,8 @@ extern void update_window_cursor (struct window *w, int on); | |||
| 5308 | NSTRACE (windowDidDeminiaturize); | 5310 | NSTRACE (windowDidDeminiaturize); |
| 5309 | if (!emacsframe->output_data.ns) | 5311 | if (!emacsframe->output_data.ns) |
| 5310 | return; | 5312 | return; |
| 5311 | emacsframe->async_visible = 1; | ||
| 5312 | emacsframe->async_iconified = 0; | 5313 | emacsframe->async_iconified = 0; |
| 5314 | emacsframe->async_visible = 1; | ||
| 5313 | windows_or_buffers_changed++; | 5315 | windows_or_buffers_changed++; |
| 5314 | 5316 | ||
| 5315 | if (emacs_event) | 5317 | if (emacs_event) |
| @@ -5340,6 +5342,7 @@ extern void update_window_cursor (struct window *w, int on); | |||
| 5340 | return; | 5342 | return; |
| 5341 | 5343 | ||
| 5342 | emacsframe->async_iconified = 1; | 5344 | emacsframe->async_iconified = 1; |
| 5345 | emacsframe->async_visible = 0; | ||
| 5343 | 5346 | ||
| 5344 | if (emacs_event) | 5347 | if (emacs_event) |
| 5345 | { | 5348 | { |