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

FRAME_NS_VIEW on terminal frames (Bug#4765).

diff --git a/src/ChangeLog b/src/ChangeLog
index a30b6580c8812a89811490baa523c73060bd8c18..9995421f5a57e147ccf639ca0384348e0d7a3328 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/nsfns.m b/src/nsfns.m
index dbd41707e719bc815886dbdc256f8f949d92e5d3..642ff794c0528b89986683545392468c82a300ea 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -521,7 +521,7 @@ ns_set_name_iconic (struct frame *f, Lisp_Object name, int explicit)
 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 @@ ns_set_name (struct frame *f, Lisp_Object name, int explicit)
 
   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 @@ x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
 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 @@ ns_set_name_as_filename (struct frame *f)
   else
     CHECK_STRING (name);
 
+  view = FRAME_NS_VIEW (f);
+
   title = FRAME_ICONIFIED_P (f) ? [[[view window] miniwindowTitle] UTF8String]
                                 : [[[view window] title] UTF8String];