mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
FRAME_NS_VIEW on terminal frames (Bug#4765).
This commit is contained in:
Chong Yidong 2009-10-24 18:58:50 +00:00
parent 86f1602f64
commit fec8f0fe66
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

8
src/nsfns.m
View file

@ -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];