[Emacs-diffs] /srv/bzr/emacs/trunk r99924: Fix crash on NextStep terminal (Bug#5837)

[Chong Yidong]

------------------------------------------------------------
revno: 99924
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-04-17 11:53:55 -0400
message:
  Fix crash on NextStep terminal (Bug#5837)
  
  * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
  terminal frames (Bug#5837).
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-17 13:34:23 +0000
+++ b/src/ChangeLog     2010-04-17 15:53:55 +0000
@@ -327,6 +327,11 @@
        (gif_load): Put GIF extension data to the property
        `Qextension_data'.
 
+2010-04-05  Chong Yidong  <address@hidden>
+
+       * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+       terminal frames (Bug#5837).
+
 2010-03-31  Chong Yidong  <address@hidden>
 
        * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-04-16 20:37:59 +0000
+++ b/src/xdisp.c       2010-04-17 15:53:55 +0000
@@ -9831,7 +9831,8 @@
          update_tool_bar (f, 0);
 #endif
 #ifdef HAVE_NS
-          if (windows_or_buffers_changed)
+          if (windows_or_buffers_changed
+             && FRAME_NS_P (f))
             ns_set_doc_edited (f, Fbuffer_modified_p
                               (XWINDOW (f->selected_window)->buffer));
 #endif