[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 17b8d63 3/9: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 17b8d63 3/9: Merge from origin/emacs-25 |
Date: |
Thu, 26 May 2016 20:22:43 +0000 (UTC) |
branch: master
commit 17b8d63057af2f1ad930bfe4bcd3aee5dd8996a4
Merge: fa419c2 06cb28f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
06cb28f Fix bug#23462: Crash when iconifying frame on OS X.
---
src/nsterm.m | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/nsterm.m b/src/nsterm.m
index d79e4f4..f2b0d90 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1612,7 +1612,12 @@ x_iconify_frame (struct frame *f)
[[view window] orderOut: NSApp];
[[view window] setFrame: t display: NO];
}
+
+ /* Processing input while Emacs is being minimized can cause a
+ crash, so block it for the duration. */
+ block_input();
[[view window] miniaturize: NSApp];
+ unblock_input();
}
/* Free X resources of frame F. */
- [Emacs-diffs] master updated (01d70ef -> 9a83497), Paul Eggert, 2016/05/26
- [Emacs-diffs] master 17b8d63 3/9: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master 745dd91 1/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/26
- [Emacs-diffs] master 9a83497 9/9: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Paul Eggert, 2016/05/26
- [Emacs-diffs] master 6ca3667 8/9: Repair damage from emacs-25 merge, Paul Eggert, 2016/05/26
- [Emacs-diffs] master 764f048 6/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/26
- [Emacs-diffs] master 018be26 5/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/26
- [Emacs-diffs] master 7ed7675 4/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/26
- [Emacs-diffs] master fa419c2 2/9: ; Merge from origin/emacs-25, Paul Eggert, 2016/05/26
- [Emacs-diffs] master 0bf5739 7/9: Merge from origin/emacs-25, Paul Eggert, 2016/05/26