Commit fec8f0fe authored by Chong Yidong's avatar Chong Yidong
Browse files

* nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call

FRAME_NS_VIEW on terminal frames (Bug#4765).
parent 86f1602f
2009-10-24 Chong Yidong <cyd@stupidchicken.com>
* nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call
FRAME_NS_VIEW on terminal frames (Bug#4765).
2009-10-24 Andreas Schwab <schwab@linux-m68k.org>
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
......
......@@ -521,7 +521,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
static void
ns_set_name (struct frame *f, Lisp_Object name, int explicit)
{
NSView *view = FRAME_NS_VIEW (f);
NSView *view;
NSTRACE (ns_set_name);
if (ns_in_resize)
......@@ -552,6 +552,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
CHECK_STRING (name);
view = FRAME_NS_VIEW (f);
/* Don't change the name if it's already NAME. */
if ([[[view window] title]
isEqualToString: [NSString stringWithUTF8String:
......@@ -615,7 +617,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
void
ns_set_name_as_filename (struct frame *f)
{
NSView *view = FRAME_NS_VIEW (f);
NSView *view;
Lisp_Object name;
Lisp_Object buf = XWINDOW (f->selected_window)->buffer;
const char *title;
......@@ -638,6 +640,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
else
CHECK_STRING (name);
view = FRAME_NS_VIEW (f);
title = FRAME_ICONIFIED_P (f) ? [[[view window] miniwindowTitle] UTF8String]
: [[[view window] title] UTF8String];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment