]> git.eshelyaron.com Git - emacs.git/commitdiff
merge trunk
authorKenichi Handa <handa@gnu.org>
Thu, 21 Mar 2013 15:21:20 +0000 (00:21 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 21 Mar 2013 15:21:20 +0000 (00:21 +0900)
1  2 
src/ChangeLog

diff --cc src/ChangeLog
index 2498bc8c97440249c7b76d01355d3eb32ef27a17,d71b933531905656eb3dd78e4c9666f3a622942d..0634ec7cc1d3f0413e7c902df05a0d3a71ecb01f
@@@ -1,9 -1,30 +1,36 @@@
 +2013-03-21  Kenichi Handa  <handa@gnu.org>
 +
 +      * coding.c (syms_of_coding): Cancel previous change.
 +
 +      * insdel.c (insert_from_gap): Fix previous change.
 +
+ 2013-03-20  Dmitry Antipov  <dmantipov@yandex.ru>
+       * window.h (struct window): Convert left_col, top_line, total_lines
+       and total_cols from Lisp_Objects to integers.  Adjust comments.
+       (wset_left_col, wset_top_line, wset_total_cols, wset_total_lines):
+       Remove.
+       (WINDOW_TOTAL_COLS, WINDOW_TOTAL_LINES, WINDOW_LEFT_EDGE_COL)
+       (WINDOW_TOP_EDGE_LINE): Drop Lisp_Object to integer conversion.
+       * dispnew.c, frame.c, w32fns.c, window.c, xdisp.c, xfns.c:
+       Adjust users where appropriate.
+ 2013-03-20  Dmitry Antipov  <dmantipov@yandex.ru>
+       * frame.h (struct frame): Drop resx and resy because the same data is
+       available from window system-specific output context.  Adjust users.
+       (default_pixels_per_inch_x, default_pixels_per_inch_y): New
+       functions to provide defaults when no window system available.
+       (FRAME_RES_X, FRAME_RES_Y): New macros.
+       (NUMVAL): Moved from xdisp.c.
+       * font.c (font_pixel_size, font_find_for_lface, font_open_for_lface)
+       (Ffont_face_attributes, Fopen_font):
+       * image.c (gs_load):
+       * w32font.c (fill_in_logfont):
+       * xdisp.c (calc_pixel_width_or_height):
+       * xfaces.c (Fx_family_fonts, set_lface_from_font): Use them.
+       * xsettings.c (apply_xft_settings): Drop frame loop and adjust comment.
  2013-03-20  Kenichi Handa  <handa@gnu.org>
  
        * coding.c (syms_of_coding): Initialize disable_ascii_optimization