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 cafbd2dda69a3770318fcaf182d7ee48433175cb..be916dff20dec12cc8b19c195c97ac28e1de0869 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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 1b6cbfbe27a0796c6bfc740193a4c13c559cf32c..734b60bc1dd716aefa9d0aa07c1579cd1bae2641 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9570,7 +9570,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