From: Kenichi Handa Date: Thu, 21 Mar 2013 15:21:20 +0000 (+0900) Subject: merge trunk X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~528 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=022039da8ea1166498c507dda4944afd9c49c9fe;p=emacs.git merge trunk --- 022039da8ea1166498c507dda4944afd9c49c9fe diff --cc src/ChangeLog index 2498bc8c974,d71b9335319..0634ec7cc1d --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,9 -1,30 +1,36 @@@ +2013-03-21 Kenichi Handa + + * coding.c (syms_of_coding): Cancel previous change. + + * insdel.c (insert_from_gap): Fix previous change. + + 2013-03-20 Dmitry Antipov + + * 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 + + * 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 * coding.c (syms_of_coding): Initialize disable_ascii_optimization