From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 17 Apr 2010 15:53:55 +0000 (-0400)
Subject: Fix crash on NextStep terminal (Bug#5837)
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~490
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8a1d5a14bc98d04128de956f77cd2b723b62cc2;p=emacs.git

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 4a388d29570..0fe9d8d0d53 100644
--- 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 c23c360832f..57f75cedf8d 100644
--- 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