diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-03-28 09:38:22 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-03-28 09:38:22 -0700 |
| commit | 7d8234c0cb9daac31ae2f660f503a3ede7324549 (patch) | |
| tree | 62529bfe7a2ba90f934f416031cbc62930f7124f /src/nsterm.m | |
| parent | e6bb547353915b376b663fda32f88d1bf8f24d1f (diff) | |
| parent | 9bff405d09f6eeeb577e6e0111e49f35d3b95b52 (diff) | |
| download | emacs-7d8234c0cb9daac31ae2f660f503a3ede7324549.tar.gz | |
Merge from origin/emacs-26
9bff405 (origin/emacs-26) * doc/misc/org.texi (Installation): Fix clo...
613c9a5 Update Org to v9.1.9
1b075a9 ; Fix some tiny doc typos
441fe20 De-obsolete `if-let' and `when-let'
8696038 * lisp/htmlfontify.el (hfy-begin-span-handler): Doc fix.
930f7b1 * doc/lispref/functions.texi (Defining Functions): Improve in...
95ccf50 Fix crash after frame is freed on macOS (bug#30800)
45d0475 More manual editing
2acb9f0 Minor manual changes changes
d481cba * lisp/calculator.el (calculator-paste-decimals): Add version.
7d6c7d0 ; Use GNU not Gnu in docs
1bc4def More proofreading of the Emacs manual
Conflicts:
doc/misc/org.texi
etc/NEWS
lisp/org/org-clock.el
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index d6c1d72a631..06ba2e1a4c7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1783,6 +1783,10 @@ x_free_frame_resources (struct frame *f) dpyinfo->x_highlight_frame = 0; if (f == hlinfo->mouse_face_mouse_frame) reset_mouse_highlight (hlinfo); + /* Ensure that sendEvent does not attempt to dereference a freed + frame. (bug#30800) */ + if (represented_frame == f) + represented_frame = NULL; if (f->output_data.ns->miniimage != nil) [f->output_data.ns->miniimage release]; |