aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2008-06-04 20:52:12 +0000
committerJuanma Barranquero2008-06-04 20:52:12 +0000
commite6841c3bc8523c54732046e6e86462f615a3b4ed (patch)
tree6b22ef594031aadb6a9398daf1da8704cb01e065 /src
parentcfbb239560674ae303f3ed30d40ab85eef3c9656 (diff)
downloademacs-e6841c3bc8523c54732046e6e86462f615a3b4ed.tar.gz
emacs-e6841c3bc8523c54732046e6e86462f615a3b4ed.zip
(struct window): Add new member window_parameters.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog19
-rw-r--r--src/window.h6
2 files changed, 18 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 673c3c012ca..c4efbf31bb1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12008-06-04 Joakim Verona <joakim@verona.se>
2
3 * window.h (struct window): Add new member window_parameters.
4
5 * window.c (Fwindow_parameters, Fwindow_parameter)
6 (Fset_window_parameter): New defuns.
7 (syms_of_window): Defsubr the new defuns.
8 (make_window): Initialize window_parameters to nil.
9
12008-06-04 John Paul Wallington <jpw@pobox.com> 102008-06-04 John Paul Wallington <jpw@pobox.com>
2 11
3 * eval.c (Fdefmacro): Doc fix. 12 * eval.c (Fdefmacro): Doc fix.
@@ -73,11 +82,11 @@
73 82
742008-06-01 Jason Rumney <jasonr@gnu.org> 832008-06-01 Jason Rumney <jasonr@gnu.org>
75 84
76 * w32font.c (w32_enumfont_pattern_entity): Use requested registry. 85 * w32font.c (w32_enumfont_pattern_entity): Use requested registry.
77 Treat iso10646-1 and Windows DEFAULT_CHARSET specially. 86 Treat iso10646-1 and Windows DEFAULT_CHARSET specially.
78 Duplicate iso8859-1 fonts as iso10646-1 if no registry specified. 87 Duplicate iso8859-1 fonts as iso10646-1 if no registry specified.
79 Don't add empty script list. 88 Don't add empty script list.
80 (w32_registry): Only map DEFAULT_CHARSET to iso10646-1 here. 89 (w32_registry): Only map DEFAULT_CHARSET to iso10646-1 here.
81 90
822008-06-01 Dan Nicolaescu <dann@ics.uci.edu> 912008-06-01 Dan Nicolaescu <dann@ics.uci.edu>
83 92
diff --git a/src/window.h b/src/window.h
index 8246336609f..0b38c5c8696 100644
--- a/src/window.h
+++ b/src/window.h
@@ -224,10 +224,12 @@ struct window
224 proportionally. */ 224 proportionally. */
225 Lisp_Object resize_proportionally; 225 Lisp_Object resize_proportionally;
226 226
227 /* Original window height and top before mini-window was 227 /* Original window height and top before mini-window was enlarged. */
228 enlarged. */
229 Lisp_Object orig_total_lines, orig_top_line; 228 Lisp_Object orig_total_lines, orig_top_line;
230 229
230 /* An alist with parameteres. */
231 Lisp_Object window_parameters;
232
231 /* No Lisp data may follow below this point without changing 233 /* No Lisp data may follow below this point without changing
232 mark_object in alloc.c. The member current_matrix must be the 234 mark_object in alloc.c. The member current_matrix must be the
233 first non-Lisp member. */ 235 first non-Lisp member. */