From: Paul Eggert Date: Mon, 14 Nov 2011 04:35:22 +0000 (-0800) Subject: Merge from trunk. X-Git-Tag: emacs-pretest-24.0.92~121^2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3ca24d48c10fb771ee02eb58f7d49bd82d6306e;p=emacs.git Merge from trunk. --- c3ca24d48c10fb771ee02eb58f7d49bd82d6306e diff --cc src/ChangeLog index 4e56e3c8499,f4250ec83b0..533f5cf4327 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,22 -1,48 +1,67 @@@ - 2011-11-10 Paul Eggert ++2011-11-14 Paul Eggert + + Standardize on VIRT_ADDR_VARIES behavior; otherwise, valgrind + does not work on some platforms. Problem reported by Andreas Schwab in + . + * puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES + is set, removing the need for VIRT_ADDRESS_VARIES. + (PURE_P): Use a more-efficient implementation that needs just one + comparison, not two: on x86-64 with GCC 4.6.2, this cut down the + number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge) + to 4 (xorl, subq, cmpq, setbe). + * alloc.c (pure): Always extern now, since that's the + VIRT_ADDR_VARIES behavior. + (PURE_POINTER_P): Use a single comparison, not two, for + consistency with the new puresize.h. + * lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed. + * m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h: + Remove VIRT_ADDR_VARIES no longer needed. + + 2011-11-12 Eli Zaretskii + + * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs + with user-defined heap size. Bump the default size of the temacs + heap to 27MB, to avoid memory warning when running temacs. + ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value. + + * dispnew.c (scrolling_window): Fix incorrect indices in accessing + current_matrix and desired_matrix. (Bug#9990) + (verify_row_hash) [XASSERTS]: New function. + (adjust_glyph_matrix, row_equal_p): Use it in xassert to verify + that the hash value of glyph rows is correct. + + 2011-11-12 Martin Rudalics + + * window.h (window): Remove splits slot. + * window.c (Fwindow_splits, Fset_window_splits): Remove. + (Fdelete_other_windows_internal, make_parent_window) + (make_window, Fsplit_window_internal, Fdelete_window_internal) + (Fset_window_configuration, save_window_save): Don't deal with + split status of windows. + (saved_window): Remove splits slot. + (Vwindow_splits): Rewrite doc-string. + + 2011-11-11 Jan Djärv + + * xfns.c (unwind_create_frame): + * nsfns.m (unwind_create_frame): + * w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in + Vframe_list (Bug#9999). + + 2011-11-11 Dmitry Antipov + + * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. + + 2011-11-11 Kenichi Handa + + * callproc.c (Fcall_process): Set the member dst_multibyte of + process_coding. + + 2011-11-11 Johan Bockgård + + * xdisp.c (fill_composite_glyph_string): Always set s->face, to + avoid a crash (bug#9496). + 2011-11-09 Chong Yidong * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges)