aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2007-10-12 08:36:47 +0000
committerMartin Rudalics2007-10-12 08:36:47 +0000
commit5839d7e85ca7596071d459595f194f45027535df (patch)
tree9f4deffd3eb1a002cbd36009984a961b05b6ee8d /src
parentd6c19bb35a2242b1eb0cef45a5a36d9ad52c5b23 (diff)
downloademacs-5839d7e85ca7596071d459595f194f45027535df.tar.gz
emacs-5839d7e85ca7596071d459595f194f45027535df.zip
(Qexplicit_name): New variable.
(x_report_frame_params): Report it in parameter alist. (syms_of_frame): Intern and staticpro it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/frame.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1220112b8b7..e6c3e1d40a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12007-10-12 Martin Rudalics <rudalics@gmx.at>
2
3 * frame.c (Qexplicit_name): New variable.
4 (x_report_frame_params): Report it in parameter alist.
5 (syms_of_frame): Intern and staticpro it.
6
12007-10-09 Jason Rumney <jasonr@gnu.org> 72007-10-09 Jason Rumney <jasonr@gnu.org>
2 8
3 * w32term.c (x_set_window_size): Disable code that attempts to tell 9 * w32term.c (x_set_window_size): Disable code that attempts to tell
diff --git a/src/frame.c b/src/frame.c
index a47dff82f5d..df98475d7b3 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -100,6 +100,7 @@ Lisp_Object Qouter_window_id;
100#endif 100#endif
101Lisp_Object Qparent_id; 101Lisp_Object Qparent_id;
102Lisp_Object Qtitle, Qname; 102Lisp_Object Qtitle, Qname;
103Lisp_Object Qexplicit_name;
103Lisp_Object Qunsplittable; 104Lisp_Object Qunsplittable;
104Lisp_Object Qmenu_bar_lines, Qtool_bar_lines; 105Lisp_Object Qmenu_bar_lines, Qtool_bar_lines;
105Lisp_Object Qleft_fringe, Qright_fringe; 106Lisp_Object Qleft_fringe, Qright_fringe;
@@ -3006,6 +3007,7 @@ x_report_frame_params (f, alistptr)
3006 tem = Qnil; 3007 tem = Qnil;
3007 else 3008 else
3008 XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc); 3009 XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc);
3010 store_in_alist (alistptr, Qexplicit_name, (f->explicit_name ? Qt : Qnil));
3009 store_in_alist (alistptr, Qparent_id, tem); 3011 store_in_alist (alistptr, Qparent_id, tem);
3010} 3012}
3011 3013
@@ -3967,6 +3969,8 @@ syms_of_frame ()
3967 staticpro (&Qframep); 3969 staticpro (&Qframep);
3968 Qframe_live_p = intern ("frame-live-p"); 3970 Qframe_live_p = intern ("frame-live-p");
3969 staticpro (&Qframe_live_p); 3971 staticpro (&Qframe_live_p);
3972 Qexplicit_name = intern ("explicit-name");
3973 staticpro (&Qexplicit_name);
3970 Qheight = intern ("height"); 3974 Qheight = intern ("height");
3971 staticpro (&Qheight); 3975 staticpro (&Qheight);
3972 Qicon = intern ("icon"); 3976 Qicon = intern ("icon");