[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/nsfns.m,v
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] Changes to emacs/src/nsfns.m,v |
Date: |
Mon, 28 Jul 2008 01:41:58 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 08/07/28 01:41:57
Index: nsfns.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfns.m,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- nsfns.m 27 Jul 2008 19:20:33 -0000 1.16
+++ nsfns.m 28 Jul 2008 01:41:57 -0000 1.17
@@ -78,7 +78,6 @@
extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
Lisp_Object Qnone;
-Lisp_Object Qns_frame_parameter;
Lisp_Object Qbuffered;
Lisp_Object Qfontsize;
@@ -1057,6 +1056,10 @@
check_ns ();
+ /* Seems a little strange, but other terms do it. Perhaps the code below
+ is modifying something? */
+ parms = Fcopy_alist (parms);
+
display = x_get_arg (dpyinfo, parms, Qterminal, 0, 0, RES_TYPE_STRING);
if (EQ (display, Qunbound))
display = Qnil;
@@ -1075,6 +1078,8 @@
if (STRINGP (name))
Vx_resource_name = name;
+ else
+ Vx_resource_name = Vinvocation_name;
parent = x_get_arg (dpyinfo, parms, Qparent_id, 0, 0, RES_TYPE_NUMBER);
if (EQ (parent, Qunbound))
@@ -1136,7 +1141,7 @@
f->icon_name = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title",
RES_TYPE_STRING);
- if (EQ (f->icon_name, Qunbound) || (XTYPE (f->icon_name) != Lisp_String))
+ if (! STRINGP (f->icon_name))
f->icon_name = Qnil;
FRAME_NS_DISPLAY_INFO (f) = dpyinfo;
@@ -1275,18 +1280,18 @@
Vframe_list = Fcons (frame, Vframe_list);
/*FRAME_NS_DISPLAY_INFO (f)->reference_count++; */
- x_default_parameter (f, parms, Qcursor_type, Qbox, "cursorType",
"CursorType",
- RES_TYPE_SYMBOL);
- x_default_parameter (f, parms, Qscroll_bar_width, Qnil, "scrollBarWidth",
- "ScrollBarWidth", RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qicon_type, Qnil, "bitmapIcon", "BitmapIcon",
RES_TYPE_SYMBOL);
- x_default_parameter (f, parms, Qauto_raise, Qnil, "autoRaise", "AutoRaise",
+ x_default_parameter (f, parms, Qauto_raise, Qnil, "autoRaise",
"AutoRaiseLower",
RES_TYPE_BOOLEAN);
x_default_parameter (f, parms, Qauto_lower, Qnil, "autoLower", "AutoLower",
RES_TYPE_BOOLEAN);
- x_default_parameter (f, parms, Qbuffered, Qt, "buffered", "Buffered",
- RES_TYPE_BOOLEAN);
+ x_default_parameter (f, parms, Qcursor_type, Qbox, "cursorType",
"CursorType",
+ RES_TYPE_SYMBOL);
+ x_default_parameter (f, parms, Qscroll_bar_width, Qnil, "scrollBarWidth",
+ "ScrollBarWidth", RES_TYPE_NUMBER);
+ x_default_parameter (f, parms, Qalpha, Qt, "alpha", "Alpha",
+ RES_TYPE_NUMBER);
width = FRAME_COLS (f);
height = FRAME_LINES (f);
@@ -2603,8 +2608,6 @@
{
int i;
- Qns_frame_parameter = intern ("ns-frame-parameter");
- staticpro (&Qns_frame_parameter);
Qnone = intern ("none");
staticpro (&Qnone);
Qbuffered = intern ("bufferd");
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, (continued)
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Adrian Robert, 2008/07/19
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Chong Yidong, 2008/07/21
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Dan Nicolaescu, 2008/07/21
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Adrian Robert, 2008/07/21
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, David Reitter, 2008/07/21
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Dan Nicolaescu, 2008/07/22
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Dan Nicolaescu, 2008/07/22
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Adrian Robert, 2008/07/22
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Adrian Robert, 2008/07/22
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v, Adrian Robert, 2008/07/27
- [Emacs-diffs] Changes to emacs/src/nsfns.m,v,
Adrian Robert <=