summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-01-22 07:55:18 -0800
committerGlenn Morris <rgm@gnu.org>2020-01-22 07:55:18 -0800
commit83d493426b8b48826d429929053791644a6e9646 (patch)
tree657f10c2998c26ae616198df0279d7d2c036093a /src
parent2d9d62bb24c662890c943f16750f4a852aa6dc8b (diff)
parent3ba0db41e3fcfdc47368e9e6fd7cbe45230ba88b (diff)
downloademacs-83d493426b8b48826d429929053791644a6e9646.tar.gz
Merge from origin/emacs-27
3ba0db41e3 Allow optional truncation of tab names in tab-bar and tab-... 7dd065fc7b Small fixes in documentation. 06166aa719 Improve explanation of available font backends under X 2eb834ead4 Clear output data pointer on NS
Diffstat (limited to 'src')
-rw-r--r--src/nsterm.m1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 57573ef8d7e..fd23bf6b2c9 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1644,6 +1644,7 @@ ns_free_frame_resources (struct frame *f)
[view release];
xfree (f->output_data.ns);
+ f->output_data.ns = NULL;
unblock_input ();
}