1 files changed, 43 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b406a7bc46..04e58e4742f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,46 @@
+2011-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * s/gnu.h (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS (Bug#9926).
+
+2011-11-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Avoid some portability problems by eschewing 'extern inline' functions.
+        The trivial performance wins aren't worth the portability hassles; see
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>
+        et seq.
+        * dispextern.h (window_box, window_box_height, window_text_bottom_y)
+        (window_box_width, window_box_left, window_box_left_offset)
+        (window_box_right, window_box_right_offset): Undo previous change,
+        by removing the "extern"s.
+        * intervals.c (adjust_intervals_for_insertion)
+        (adjust_intervals_for_deletion): Undo previous change,
+        making these static again.
+        (offset_intervals, temp_set_point_both, temp_set_point)
+        (copy_intervals_to_string): No longer inline.
+        * xdisp.c (window_text_bottom_y, window_box_width)
+        (window_box_height, window_box_left_offset)
+        (window_box_right_offset, window_box_left, window_box_right)
+        (window_box): No longer inline.
+
+2011-11-08  Chong Yidong  <cyd@gnu.org>
+
+        * window.c (Fwindow_left_column, Fwindow_top_line): Doc fix.
+        (Fwindow_body_height, Fwindow_body_width): Move from Lisp.  Signal
+        an error if not a live window.
+        (Fwindow_total_width, Fwindow_total_height): Move from Lisp.
+        (Fwindow_total_size, Fwindow_body_size): Move to Lisp.
+
+2011-11-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lisp.h (syms_of_abbrev): Remove declaration.
+        Reported by CHENG Gao <chenggao@royau.me>.
+
+2011-11-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (check_windows_init_file): Don't look for term/w32-win.el
+        if Vpurify_flag is non-nil.  Fixes a crash when running w32 build
+        of temacs in GUI mode.
+
 2011-11-07  Martin Rudalics  <rudalics@gmx.at>
 
         * window.h: Declare delete_all_child_windows instead of