diff options
| author | Joakim Verona | 2013-09-13 17:11:02 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-13 17:11:02 +0200 |
| commit | fda7ba7c422a8d5a5827e33bb1c800778790955f (patch) | |
| tree | 74a7f099ea80bbaca3a6ce7e7d6cddb651c5dc07 /src/widget.c | |
| parent | 9de87b9a2f98b8f7b24b3a7b7cb1dfda7c562bf1 (diff) | |
| parent | aad3612f9eb7280bd4db8ee697186e75b1e82765 (diff) | |
| download | emacs-fda7ba7c422a8d5a5827e33bb1c800778790955f.tar.gz emacs-fda7ba7c422a8d5a5827e33bb1c800778790955f.zip | |
merge from trunk
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widget.c b/src/widget.c index ec0b506046b..d6469d7eec5 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -525,7 +525,7 @@ setup_frame_gcs (EmacsFrame ew) | |||
| 525 | font = Ffont_xlfd_name (font, Qnil); | 525 | font = Ffont_xlfd_name (font, Qnil); |
| 526 | if (STRINGP (font)) | 526 | if (STRINGP (font)) |
| 527 | { | 527 | { |
| 528 | XFontStruct *xfont = XLoadQueryFont (FRAME_X_DISPLAY_INFO (s)->display, | 528 | XFontStruct *xfont = XLoadQueryFont (FRAME_DISPLAY_INFO (s)->display, |
| 529 | SSDATA (font)); | 529 | SSDATA (font)); |
| 530 | if (xfont) | 530 | if (xfont) |
| 531 | { | 531 | { |