[Emacs-diffs] Changes to emacs/src/xfaces.c

[Kenichi Handa]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.281 emacs/src/xfaces.c:1.282
*** emacs/src/xfaces.c:1.281    Thu Jun 26 17:18:45 2003
--- emacs/src/xfaces.c  Fri Aug 15 08:08:51 2003
***************
*** 6045,6050 ****
--- 6045,6062 ----
        return 1;
      }
  
+   if (! compare_pt_p)
+     {
+       /* We prefer a real scalable font; i.e. not what autoscaled.  */
+       int auto_scaled_1 = (font1->numeric[XLFD_POINT_SIZE] == 0
+                          && font1->numeric[XLFD_RESY] > 0);
+       int auto_scaled_2 = (font2->numeric[XLFD_POINT_SIZE] == 0
+                          && font2->numeric[XLFD_RESY] > 0);
+ 
+       if (auto_scaled_1 != auto_scaled_2)
+       return auto_scaled_2;
+     }
+ 
    return font1->registry_priority < font2->registry_priority;
  }
  
***************
*** 6277,6283 ****
                || better_font_p (specified, fonts + i, best, 0, 0)
                || (!non_scalable_has_exact_height_p
                    && !better_font_p (specified, best, fonts + i, 0, 0)))
!             best = fonts + i;
          }
  
        if (needs_overstrike)
--- 6289,6298 ----
                || better_font_p (specified, fonts + i, best, 0, 0)
                || (!non_scalable_has_exact_height_p
                    && !better_font_p (specified, best, fonts + i, 0, 0)))
!             {
!               non_scalable_has_exact_height_p = 1;
!               best = fonts + i;
!             }
          }
  
        if (needs_overstrike)