diff options
| author | Glenn Morris <[email protected]> | 2008-11-26 03:00:53 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2008-11-26 03:00:53 +0000 |
| commit | 9f688acf323a27f4fae650061768152f92411692 (patch) | |
| tree | c8ef6ea03115e6c0b59fdefad56c373c03e9e778 /src | |
| parent | 5a3008ede5332fdd10b5eaef9150a308e853cca4 (diff) | |
(Fx_font_family_list): Replace lisp/term/pc-win.el redefinition with
ifdef. (Bug#1383)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 862711a779..905ea2729a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-11-26 Glenn Morris <[email protected]> + + * xfaces.c (Fx_font_family_list): Replace lisp/term/pc-win.el + redefinition with ifdef. (Bug#1383) + 2008-11-24 Chong Yidong <[email protected]> * minibuf.c (Fcompleting_read, Vminibuffer_completion_confirm): diff --git a/src/xfaces.c b/src/xfaces.c index 68d63d690d..31f56df6ab 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1839,7 +1839,11 @@ are fixed-pitch. */) (frame) Lisp_Object frame; { +#ifdef MSDOS + return Fcons (Fcons (build_string ("default"), Qt), Qnil); +#else return Ffont_family_list (frame); +#endif } |