[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog nsfns.m
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog nsfns.m |
Date: |
Sat, 24 Oct 2009 18:58:51 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/10/24 18:58:51
Modified files:
src : ChangeLog nsfns.m
Log message:
* nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call
FRAME_NS_VIEW on terminal frames (Bug#4765).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7823&r2=1.7824
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfns.m?cvsroot=emacs&r1=1.54&r2=1.55
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7823
retrieving revision 1.7824
diff -u -b -r1.7823 -r1.7824
--- ChangeLog 24 Oct 2009 16:45:25 -0000 1.7823
+++ ChangeLog 24 Oct 2009 18:58:50 -0000 1.7824
@@ -1,3 +1,8 @@
+2009-10-24 Chong Yidong <address@hidden>
+
+ * 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 <address@hidden>
* dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
Index: nsfns.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfns.m,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- nsfns.m 19 Oct 2009 16:58:19 -0000 1.54
+++ nsfns.m 24 Oct 2009 18:58:51 -0000 1.55
@@ -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];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog nsfns.m,
Chong Yidong <=