# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1256410730 0
# Node ID 70c3773ee524cabe7df4014c8b7ecce53be655f2
# Parent  a81c63f1a19f06f2ee327dfa562281f7ec710da1
* nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call
FRAME_NS_VIEW on terminal frames (Bug#4765).

diff -r a81c63f1a19f -r 70c3773ee524 src/ChangeLog
--- a/src/ChangeLog	Sat Oct 24 18:02:47 2009 +0000
+++ b/src/ChangeLog	Sat Oct 24 18:58:50 2009 +0000
@@ -1,3 +1,8 @@
+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
diff -r a81c63f1a19f -r 70c3773ee524 src/nsfns.m
--- a/src/nsfns.m	Sat Oct 24 18:02:47 2009 +0000
+++ b/src/nsfns.m	Sat Oct 24 18:58:50 2009 +0000
@@ -521,7 +521,7 @@
 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 @@
 
   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 @@
 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 @@
   else
     CHECK_STRING (name);
 
+  view = FRAME_NS_VIEW (f);
+
   title = FRAME_ICONIFIED_P (f) ? [[[view window] miniwindowTitle] UTF8String]
                                 : [[[view window] title] UTF8String];