diff options
| author | Kenichi Handa | 2008-05-29 01:44:39 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2008-05-29 01:44:39 +0000 |
| commit | a4eec62604216f6d4efc86221466a5e883a0113b (patch) | |
| tree | 09ae6d641dc965a44352e420b88148662313c8c7 /src | |
| parent | 5ee66afc6dd6db4a2c238dad54e9c4321dbb38c9 (diff) | |
| download | emacs-a4eec62604216f6d4efc86221466a5e883a0113b.tar.gz emacs-a4eec62604216f6d4efc86221466a5e883a0113b.zip | |
(Fx_list_fonts): Make it return a list of font names.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfaces.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 78afe35a8bb..ab9fbb7ffa3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-05-29 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * xfaces.c (Fx_list_fonts): Make it return a list of font names. | ||
| 4 | |||
| 1 | 2008-05-28 Jason Rumney <jasonr@gnu.org> | 5 | 2008-05-28 Jason Rumney <jasonr@gnu.org> |
| 2 | 6 | ||
| 3 | * w32term.c (x_draw_glyph_string): Use clipmask if specified. | 7 | * w32term.c (x_draw_glyph_string): Use clipmask if specified. |
diff --git a/src/xfaces.c b/src/xfaces.c index 093fde0b39a..3afa17a1c21 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -1910,7 +1910,7 @@ the WIDTH times as wide as FACE on FRAME. */) | |||
| 1910 | 1910 | ||
| 1911 | { | 1911 | { |
| 1912 | Lisp_Object font_spec; | 1912 | Lisp_Object font_spec; |
| 1913 | Lisp_Object args[2]; | 1913 | Lisp_Object args[2], tail; |
| 1914 | 1914 | ||
| 1915 | font_spec = font_spec_from_name (pattern); | 1915 | font_spec = font_spec_from_name (pattern); |
| 1916 | if (size) | 1916 | if (size) |
| @@ -1919,6 +1919,8 @@ the WIDTH times as wide as FACE on FRAME. */) | |||
| 1919 | Ffont_put (font_spec, QCavgwidth, make_number (avgwidth)); | 1919 | Ffont_put (font_spec, QCavgwidth, make_number (avgwidth)); |
| 1920 | } | 1920 | } |
| 1921 | args[0] = Flist_fonts (font_spec, frame, maximum, Qnil); | 1921 | args[0] = Flist_fonts (font_spec, frame, maximum, Qnil); |
| 1922 | for (tail = args[0]; CONSP (tail); tail = XCDR (tail)) | ||
| 1923 | XSETCAR (tail, Ffont_xlfd_name (XCAR (tail), Qnil)); | ||
| 1922 | if (NILP (frame)) | 1924 | if (NILP (frame)) |
| 1923 | /* We don't have to check fontsets. */ | 1925 | /* We don't have to check fontsets. */ |
| 1924 | return args[0]; | 1926 | return args[0]; |