# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1270504755 0
# Node ID 82349192cc4dc8853a4d1a5daf5e17ceb7d2eab4
# Parent  bd8cc5b74c246afd613bb190cdadf6affa4d9467# Parent  a8900b7136bc7d74430cce1fc44c77555f34d8fa
Merge from mainline.

diff -r bd8cc5b74c24 -r 82349192cc4d src/ChangeLog
--- a/src/ChangeLog	Sun Apr 04 21:55:36 2010 +0000
+++ b/src/ChangeLog	Mon Apr 05 21:59:15 2010 +0000
@@ -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 bd8cc5b74c24 -r 82349192cc4d src/xdisp.c
--- a/src/xdisp.c	Sun Apr 04 21:55:36 2010 +0000
+++ b/src/xdisp.c	Mon Apr 05 21:59:15 2010 +0000
@@ -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