aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Tamm2004-05-12 02:34:57 +0000
committerSteven Tamm2004-05-12 02:34:57 +0000
commitae9292e0cb5b40127e9b55ae8e02c29d13c35c74 (patch)
tree351a013de341e3956f2fb23540befb329e2827b9 /src
parent4f013856bf34f7f20c68f2e1ae967dae499a432e (diff)
downloademacs-ae9292e0cb5b40127e9b55ae8e02c29d13c35c74.tar.gz
emacs-ae9292e0cb5b40127e9b55ae8e02c29d13c35c74.zip
macfns.c: Default to using tool-bar by setting tool-bar-lines to 1 in
default-frame-alist.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/macfns.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 16cb680e455..409c8e6c7c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,9 @@
12004-05-11 Steven Tamm <tamm@Steven-Tamms-Computer.local> 12004-05-11 Steven Tamm <steventamm@mac.com>
2
3 * macfns.c (Fx_create_frame): Default to using tool-bar by
4 setting tool-bar-lines to 1 in default-frame-alist.
5
62004-05-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * image.c (xpm_scan, xpm_make_color_table_v, xpm_put_color_table_v) 8 * image.c (xpm_scan, xpm_make_color_table_v, xpm_put_color_table_v)
4 (xpm_get_color_table_v, xpm_make_color_table_h) 9 (xpm_get_color_table_v, xpm_make_color_table_h)
diff --git a/src/macfns.c b/src/macfns.c
index dbb8adb3fe1..02d0cb88d1f 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2708,7 +2708,7 @@ This function is an internal primitive--use `make-frame' instead. */)
2708 2708
2709 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), 2709 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
2710 "menuBar", "MenuBar", RES_TYPE_NUMBER); 2710 "menuBar", "MenuBar", RES_TYPE_NUMBER);
2711 x_default_parameter (f, parms, Qtool_bar_lines, make_number (0), 2711 x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
2712 "toolBar", "ToolBar", RES_TYPE_NUMBER); 2712 "toolBar", "ToolBar", RES_TYPE_NUMBER);
2713 x_default_parameter (f, parms, Qbuffer_predicate, Qnil, 2713 x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
2714 "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); 2714 "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL);