Mercurial > emacs
changeset 107916:a8900b7136bc
Fix crash on NextStep terminal (Bug#5837)
* xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
terminal frames (Bug#5837).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 05 Apr 2010 11:46:29 -0400 |
| parents | 41c0782814ff |
| children | b8efa032f216 82349192cc4d |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Apr 04 12:42:05 2010 +0200 +++ b/src/ChangeLog Mon Apr 05 11:46:29 2010 -0400 @@ -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 12:42:05 2010 +0200 +++ b/src/xdisp.c Mon Apr 05 11:46:29 2010 -0400 @@ -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