From: Daniel Colascione Date: Mon, 8 Oct 2012 18:47:29 +0000 (-0800) Subject: Merge into trunk X-Git-Tag: emacs-24.2.90~237^2~37 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61af95a53cbf68b9a0673f0b031101f41adc63b2;p=emacs.git Merge into trunk --- 61af95a53cbf68b9a0673f0b031101f41adc63b2 diff --cc src/ChangeLog index b348ec06538,1d90b7bb9e1..4531cee8dba --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,10 -1,10 +1,15 @@@ -2012-10-08 Daniel Colascione +2012-10-08 Jan Djärv - + * nsfont.m (Vfonts_in_cache): New variable. + (nsfont_open): Use unsignedLongLongValue for cache in case wide ints + are used. Add cached fonts to Vfonts_in_cache. + (syms_of_nsfont): Initialize and staticpro Vfonts_in_cache. ++2012-10-08 Daniel Colascione + * w32fns.c (Fx_display_color_cells): Instead of using NCOLORS, + which is broke under remote desktop, calculating the number of + colors available for a display based on the display's number of + planes and number of bits per pixel per plane. (bug#10397). + 2012-10-08 Juanma Barranquero * makefile.w32-in (LOCAL_FLAGS): Don't define HAVE_NTGUI, it's now