aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2006-06-24 22:27:12 +0000
committerChong Yidong2006-06-24 22:27:12 +0000
commit86b2ba0d671ee4027b7410394e59ab6c7159e719 (patch)
tree0b1797639462e7ce14d28a19dff7cf3b09b615b3 /src
parent4179c1d6fa7944e4d86fb595ab5f382f05ede4c7 (diff)
downloademacs-86b2ba0d671ee4027b7410394e59ab6c7159e719.tar.gz
emacs-86b2ba0d671ee4027b7410394e59ab6c7159e719.zip
* xfns.c (Fx_create_frame): Set font parameter directly instead of
using x_default_parameter, since x_get_args clears the parm alist.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 81972796b4a..63475737840 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-06-24 Chong Yidong <cyd@stupidchicken.com>
2
3 * xfns.c (Fx_create_frame): Set font parameter directly instead of
4 using x_default_parameter, since x_get_args clears the parm alist.
5
12006-06-24 Eli Zaretskii <eliz@gnu.org> 62006-06-24 Eli Zaretskii <eliz@gnu.org>
2 7
3 * dired.c (directory_files_internal) [WINDOWSNT]: Find files 8 * dired.c (directory_files_internal) [WINDOWSNT]: Find files
diff --git a/src/xfns.c b/src/xfns.c
index e6772dc65d9..55575d9ec61 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3189,8 +3189,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3189 if (! STRINGP (font)) 3189 if (! STRINGP (font))
3190 font = build_string ("fixed"); 3190 font = build_string ("fixed");
3191 3191
3192 x_default_parameter (f, parms, Qfont, font, 3192 x_set_frame_parameters (f, Fcons (Fcons (Qfont, font), Qnil));
3193 "font", "Font", RES_TYPE_STRING);
3194 } 3193 }
3195 3194
3196#ifdef USE_LUCID 3195#ifdef USE_LUCID