summaryrefslogtreecommitdiff
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa <handa@gnu.org>2013-03-22 00:21:20 +0900
committerKenichi Handa <handa@gnu.org>2013-03-22 00:21:20 +0900
commit022039da8ea1166498c507dda4944afd9c49c9fe (patch)
treef6fef85c61f1483cadf977775b7f99c98f63514b /src/ChangeLog
parent8bc369d4a23a3a8040d77e3ce89a7f63b1ecff97 (diff)
parentafff09d015b0e17c059e68fe4a8f1d31014a3700 (diff)
downloademacs-022039da8ea1166498c507dda4944afd9c49c9fe.tar.gz
merge trunk
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2498bc8c974..0634ec7cc1d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,33 @@
* 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