Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 5 insertions, 14 deletions

diff --git a/src/macfont.m b/src/macfont.m
index fae284fad89..3023fbea78c 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -771,7 +771,7 @@ mac_font_descriptor_get_adjusted_weight (CTFontDescriptorRef desc, CGFloat val)
 {
   long percent_val = lround (val * 100);
 
-  if (percent_val == -40 || percent_val == 56)
+  if (percent_val == -40)
     {
       CTFontRef font = NULL;
       CFStringRef name =
@@ -786,19 +786,10 @@ mac_font_descriptor_get_adjusted_weight (CTFontDescriptorRef desc, CGFloat val)
         {
           CFIndex weight = mac_font_get_weight (font);
 
-          if (percent_val == -40)
-            {
-              /* Workaround for crash when displaying Oriya characters
-                 with Arial Unicode MS on OS X 10.11.  */
-              if (weight == 5)
-                val = 0;
-            }
-          else                  /* percent_val == 56 */
-            {
-              if (weight == 9)
-                /* Adjustment for HiraginoSans-W7 on OS X 10.11.  */
-                val = 0.4;
-            }
+          /* Workaround for crash when displaying Oriya characters
+             with Arial Unicode MS on OS X 10.11.  */
+          if (weight == 5)
+            val = 0;
           CFRelease (font);
         }
     }