diff options
| author | Jan Djärv | 2003-02-19 05:59:54 +0000 |
|---|---|---|
| committer | Jan Djärv | 2003-02-19 05:59:54 +0000 |
| commit | 72ecb43c59321f8a95dac45e9a44e60e941140e6 (patch) | |
| tree | 69d823408e7f1edadd97c4f59bcd8dcb3916bfd6 /src | |
| parent | 97d3e8cdeb8942af3b9da2aee174d65635463bc7 (diff) | |
| download | emacs-72ecb43c59321f8a95dac45e9a44e60e941140e6.tar.gz emacs-72ecb43c59321f8a95dac45e9a44e60e941140e6.zip | |
* xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfaces.c | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 04fce4d9811..c37562fb095 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2003-02-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xfaces.c (x_face_list_fonts): Set *pfonts to 0 if no fonts found. | ||
| 4 | |||
| 1 | 2003-02-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 5 | 2003-02-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * xterm.c (x_list_fonts): If maxnames is less than 0, get all font | 7 | * xterm.c (x_list_fonts): If maxnames is less than 0, get all font |
diff --git a/src/xfaces.c b/src/xfaces.c index 0e6fa8daf34..7c668bc5787 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -2516,8 +2516,12 @@ x_face_list_fonts (f, pattern, pfonts, nfonts, try_alternatives_p) | |||
| 2516 | { | 2516 | { |
| 2517 | Lisp_Object list = Valternate_fontname_alist; | 2517 | Lisp_Object list = Valternate_fontname_alist; |
| 2518 | 2518 | ||
| 2519 | if (fonts) xfree (fonts); | 2519 | if (*pfonts) |
| 2520 | 2520 | { | |
| 2521 | xfree (*pfonts); | ||
| 2522 | *pfonts = 0; | ||
| 2523 | } | ||
| 2524 | |||
| 2521 | while (CONSP (list)) | 2525 | while (CONSP (list)) |
| 2522 | { | 2526 | { |
| 2523 | Lisp_Object entry = XCAR (list); | 2527 | Lisp_Object entry = XCAR (list); |