# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1271519635 14400
# Node ID 1da056389889b7ecc198797cca11000a61d04d56
# Parent  8b1a353e3aab73f4ea3e8ff637cacdbf5b6ff4d5
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 8b1a353e3aab -r 1da056389889 src/ChangeLog
--- a/src/ChangeLog	Sat Apr 17 16:34:23 2010 +0300
+++ b/src/ChangeLog	Sat Apr 17 11:53:55 2010 -0400
@@ -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 -r 8b1a353e3aab -r 1da056389889 src/xdisp.c
--- a/src/xdisp.c	Sat Apr 17 16:34:23 2010 +0300
+++ b/src/xdisp.c	Sat Apr 17 11:53:55 2010 -0400
@@ -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