From c33070f492388b5e4d7b39ef7ff04957676e80d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 3 Nov 2014 08:15:11 +0100 Subject: [PATCH] * nsfns.m (ns_set_doc_edited): Check for FRAME_NS. Fixes: debbugs:18925 --- src/ChangeLog | 4 ++++ src/nsfns.m | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 91bd0e1137c..006e5c4b4a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-03 Jan Djärv + + * nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925). + 2014-10-31 Jan Djärv * macfont.m (macfont_glyph_extents): Turn off syntetic bold diff --git a/src/nsfns.m b/src/nsfns.m index 4fa62f56851..8129c9e2a41 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -641,8 +641,12 @@ ns_set_doc_edited (void) { BOOL edited = NO; struct frame *f = XFRAME (frame); - struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f)); - NSView *view = FRAME_NS_VIEW (f); + struct window *w; + NSView *view; + + if (! FRAME_NS_P (f)) continue; + w = XWINDOW (FRAME_SELECTED_WINDOW (f)); + view = FRAME_NS_VIEW (f); if (!MINI_WINDOW_P (w)) edited = ! NILP (Fbuffer_modified_p (w->contents)) && ! NILP (Fbuffer_file_name (w->contents)); -- 2.39.5