# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1270482389 14400
# Node ID a8900b7136bc7d74430cce1fc44c77555f34d8fa
# Parent  41c0782814ffbb0f051bc0d2b3b28a0c81090bfc
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 -r 41c0782814ff -r a8900b7136bc src/ChangeLog
--- a/src/ChangeLog	Sun Apr 04 12:42:05 2010 +0200
+++ b/src/ChangeLog	Mon Apr 05 11:46:29 2010 -0400
@@ -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 -r 41c0782814ff -r a8900b7136bc src/xdisp.c
--- a/src/xdisp.c	Sun Apr 04 12:42:05 2010 +0200
+++ b/src/xdisp.c	Mon Apr 05 11:46:29 2010 -0400
@@ -9570,7 +9570,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