aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2008-07-25 00:36:45 +0000
committerJason Rumney2008-07-25 00:36:45 +0000
commit1ada3dab92a2ee116288c64d6524d47c475f5c6c (patch)
treea7950f1191b9203e7237d5ef1ecc7cb2faf2145e
parent2bbcd618ef0b81447b01d4ecff1cae94d3468913 (diff)
downloademacs-1ada3dab92a2ee116288c64d6524d47c475f5c6c.tar.gz
emacs-1ada3dab92a2ee116288c64d6524d47c475f5c6c.zip
(Fx_select_font): Reverse sense of second arg.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32font.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d85f4d6ee18..3060905410f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-07-25 Jason Rumney <jasonr@gnu.org>
2
3 * w32font.c (Fx_select_font): Reverse sense of second arg.
4
12008-07-24 Stefan Monnier <monnier@iro.umontreal.ca> 52008-07-24 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * syntax.c (struct lisp_parse_state, char_quoted, inc_bytepos) 7 * syntax.c (struct lisp_parse_state, char_quoted, inc_bytepos)
diff --git a/src/w32font.c b/src/w32font.c
index 77e949a6af0..4a4c7625787 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2328,10 +2328,10 @@ DEFUN ("x-select-font", Fx_select_font, Sx_select_font, 0, 2, 0,
2328Return fontconfig style font string corresponding to the selection. 2328Return fontconfig style font string corresponding to the selection.
2329 2329
2330If FRAME is omitted or nil, it defaults to the selected frame. 2330If FRAME is omitted or nil, it defaults to the selected frame.
2331If INCLUDE-PROPORTIONAL is non-nil, include proportional fonts 2331If EXCLUDE-PROPORTIONAL is non-nil, exclude proportional fonts
2332in the font selection dialog. */) 2332in the font selection dialog. */)
2333 (frame, include_proportional) 2333 (frame, exclude_proportional)
2334 Lisp_Object frame, include_proportional; 2334 Lisp_Object frame, exclude_proportional;
2335{ 2335{
2336 FRAME_PTR f = check_x_frame (frame); 2336 FRAME_PTR f = check_x_frame (frame);
2337 CHOOSEFONT cf; 2337 CHOOSEFONT cf;
@@ -2348,9 +2348,9 @@ in the font selection dialog. */)
2348 cf.hwndOwner = FRAME_W32_WINDOW (f); 2348 cf.hwndOwner = FRAME_W32_WINDOW (f);
2349 cf.Flags = CF_FORCEFONTEXIST | CF_SCREENFONTS | CF_NOVERTFONTS; 2349 cf.Flags = CF_FORCEFONTEXIST | CF_SCREENFONTS | CF_NOVERTFONTS;
2350 2350
2351 /* Unless include_proportional is non-nil, limit the selection to 2351 /* If exclude_proportional is non-nil, limit the selection to
2352 monospaced fonts. */ 2352 monospaced fonts. */
2353 if (NILP (include_proportional)) 2353 if (!NILP (exclude_proportional))
2354 cf.Flags |= CF_FIXEDPITCHONLY; 2354 cf.Flags |= CF_FIXEDPITCHONLY;
2355 2355
2356 cf.lpLogFont = &lf; 2356 cf.lpLogFont = &lf;