aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cafbd2dda6..be916dff20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05 Chong Yidong <[email protected]>
+
+ * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+ terminal frames (Bug#5837).
+
2010-03-31 Chong Yidong <[email protected]>
* nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
diff --git a/src/xdisp.c b/src/xdisp.c
index 1b6cbfbe27..734b60bc1d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9570,7 +9570,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