diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-04-05 11:46:29 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-04-05 11:46:29 -0400 |
| commit | 84257d9314ac231a44eaa5f93b0247bedead1171 (patch) | |
| tree | 3fa4a0c84ca123e196001a18e441daec4c8ed799 | |
| parent | 46ac1194bf0918243337afb940579657d218ac65 (diff) | |
| download | emacs-84257d9314ac231a44eaa5f93b0247bedead1171.tar.gz | |
Fix crash on NextStep terminal (Bug#5837)
* xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
terminal frames (Bug#5837).
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cafbd2dda69..be916dff20d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/xdisp.c b/src/xdisp.c index 1b6cbfbe27a..734b60bc1dd 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 |