2016-12-21 14:38:25 +00:00
committed by Git OBS Bridge
parent da65b11f6e
commit 8380996f3e

View File

@@ -1,8 +1,9 @@
Work around openSUSE bug #1016172
--
lisp/dynamic-setting.el | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
lisp/dynamic-setting.el | 29 +++++++++++++++--------------
src/xsettings.c | 7 ++++++-
2 files changed, 21 insertions(+), 15 deletions(-)
--- lisp/dynamic-setting.el
+++ lisp/dynamic-setting.el 2016-12-20 16:51:49.533433283 +0000
@@ -57,3 +58,26 @@ Work around openSUSE bug #1016172
(defun dynamic-setting-handle-config-changed-event (event)
"Handle config-changed-event on the display in EVENT.
--- src/xsettings.c
+++ src/xsettings.c 2016-12-21 07:25:17.605036477 +0000
@@ -45,6 +45,7 @@ along with GNU Emacs. If not, see <http
#endif
#ifdef HAVE_XFT
+#include <math.h>
#include <X11/Xft/Xft.h>
#endif
@@ -620,7 +621,11 @@ apply_xft_settings (struct x_display_inf
#endif
FcPatternGetInteger (pat, FC_LCD_FILTER, 0, &oldsettings.lcdfilter);
FcPatternGetInteger (pat, FC_RGBA, 0, &oldsettings.rgba);
- FcPatternGetDouble (pat, FC_DPI, 0, &oldsettings.dpi);
+
+ if (FcPatternGetDouble (pat, FC_DPI, 0, &oldsettings.dpi) == FcResultMatch)
+ {
+ oldsettings.dpi = round(oldsettings.dpi);
+ }
if ((settings->seen & SEEN_AA) != 0 && oldsettings.aa != settings->aa)
{