diff options
| author | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
| commit | b87c4ff2817e71ca71b028792200b1e069a95e04 (patch) | |
| tree | bfe00c0655fa02078a9ab2c633ea06d90c4a2064 /src/widget.c | |
| parent | bbc108377873aa6ed7cf21c731770103096eea39 (diff) | |
| parent | ba355de014b75ed104da4777f909db70d62f2357 (diff) | |
| download | emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.tar.gz emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.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 | { |