[Emacs-diffs] emacs-24 r117659: * nsfns.m (ns_set_doc_edited): Check for FRAME_NS.

[Jan D.]

------------------------------------------------------------
revno: 117659
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18925
committer: Jan Djärv <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-11-03 08:15:11 +0100
message:
  * nsfns.m (ns_set_doc_edited): Check for FRAME_NS.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-31 18:41:07 +0000
+++ b/src/ChangeLog     2014-11-03 07:15:11 +0000
@@ -1,3 +1,7 @@
+2014-11-03  Jan Djärv  <address@hidden>
+
+       * nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925).
+
 2014-10-31  Jan Djärv  <address@hidden>
 
        * macfont.m (macfont_glyph_extents): Turn off syntetic bold

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2014-10-30 19:15:38 +0000
+++ b/src/nsfns.m       2014-11-03 07:15:11 +0000
@@ -641,8 +641,12 @@
     {
       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));