Fix crash on NextStep terminal (Bug#5837)

* xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
terminal frames (Bug#5837).

diff --git a/src/ChangeLog b/src/ChangeLog
index 4a388d29570748ecc9f4508e2de4f05787133bd6..0fe9d8d0d53c06cc258c8a093d6d884ee550796a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -327,6 +327,11 @@
        (gif_load): Put GIF extension data to the property
        `Qextension_data'.
 
+2010-04-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+       terminal frames (Bug#5837).
+
 2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
 
        * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.

diff --git a/src/xdisp.c b/src/xdisp.c
index c23c360832f6cf2c410120132d164f43e24c3290..57f75cedf8d8efdf90764e9503b302cfcea1cfb9 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9831,7 +9831,8 @@ prepare_menu_bars ()
          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