Mercurial > emacs

changeset 107921:82349192cc4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 05 Apr 2010 21:59:15 +0000
parents bd8cc5b74c24 (current diff) a8900b7136bc (diff)
children 5a53cd4938e3
files
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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