2 files changed, 7 insertions, 1 deletions

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