1 files changed, 160 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a0f83560603..6a13bd87264 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,160 @@
+2011-12-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * widget.c (update_wm_hints): Return if wmshell is null.
+        (widget_update_wm_size_hints): New function.
+
+        * widget.h (widget_update_wm_size_hints): Declare.
+
+        * xterm.c (x_wm_set_size_hint): If USE_X_TOOLKIT, call
+        widget_update_wm_size_hints (Bug#10104).
+
+2011-12-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (handle_invisible_prop): If the invisible text ends just
+        before a newline, prepare the bidi iterator for consuming the
+        newline, and keep the current paragraph direction.  (Bug#10183)
+        (redisplay_window): Don't let `margin' become negative.  (Bug#10192)
+
+2011-12-02  Juri Linkov  <juri@jurta.org>
+
+        * search.c (Fword_search_regexp): New Lisp function created from
+        `wordify'.  Change type of arg `lax' from `int' to `Lisp_Object'.
+        (Fword_search_backward, Fword_search_forward)
+        (Fword_search_backward_lax, Fword_search_forward_lax):
+        Use `Fword_search_regexp' instead of `wordify'.  Doc fix.
+        (syms_of_search): Define `Sword_search_regexp'.  (Bug#10145)
+
+2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fileio.c (Finsert_file_contents): Move after-change-function call
+        to before the "handled:" label, since all "goto handled" appear in
+        cases where the *-change-functions have already been properly called
+        (bug#10117).
+
+2011-12-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * keyboard.c (interrupt_signal): Don't call kill-emacs when
+        waiting for input.  (Bug#10169)
+
+2011-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix): Remove the assertion that
+        verifies glyph row's hash code--we have just reallocated the
+        glyphs, so their contents can be complete garbage.  (Bug#10164)
+
+2011-11-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check.
+
+2011-11-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's
+        attributes are tested _before_ calling verify_row_hash, to protect
+        against GCC re-ordering of the tests.  (Bug#10164)
+
+2011-11-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (struct x_output): net_wm_state_hidden_seen is new.
+
+        * xterm.c (handle_one_xevent): Only set async_visible and friends
+        if net_wm_state_hidden_seen is non-zero (Bug#10002)
+        (get_current_wm_state):  Set net_wm_state_hidden_seen to 1 if
+        _NET_WM_STATE_HIDDEN is in NET_WM_STATE.
+
+2011-11-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove GCPRO-related macros that exist only to avoid shadowing locals.
+        * lisp.h (GCPRO1_VAR, GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR, GCPRO5_VAR)
+        (GCPRO6_VAR, UNGCPRO_VAR): Remove.  See
+        <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+        All uses changed to use GCPRO1 etc.
+        (GCPRO1, GCPRO2, GCPRO3, GCPRO4, GCPRO5, GCPRO6, UNGCPRO):
+        Revert to old implementation (i.e., before 2011-03-11).
+
+2011-11-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * dispnew.c (scrolling_window): Truncate overlaps in copy destination
+        of scroll runs so as to avoid assigning disabled bogus rows and
+        unnecessary graphics copy operations.
+
+2011-11-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/ms-w32.h (utimbuf) [_MSC_VER]: Don't define.
+        (snprintf) [_MSC_VER]: Redirect to _snprintf.
+        (strtoll) [_MSC_VER]: Redirect to _strtoi64.
+        (malloc, free, realloc, calloc): Redirect to e_* only when
+        compiling Emacs.
+
+        * lisp.h (GCTYPEBITS): Move before first use.
+        (ALIGN_GCTYPEBITS) [_MSC_VER]: Define.
+        (DECL_ALIGN) [_MSC_VER]: Use it, as MSVC doesn't like bit ops in
+        this macro definition.
+
+        * s/ms-w32.h (tzname): Redirect to _tzname for all values of
+        _MSC_VER.
+
+2011-11-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_create_frame_widgets): Call
+        gtk_window_set_has_resize_grip (FALSE) if that function is
+        present with Gtk+ 2.0.
+
+2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Finsert_file_contents): Undo previous change; see
+        <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+
+2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Rename locals to avoid shadowing.
+        * fileio.c (Finsert_file_contents):
+        Rename inner 'gcpro1' to 'inner_gcpro1' to avoid shadowing.
+        * process.c (wait_reading_process_output):
+        Rename inner 'proc' to 'p' to avoid shadowing.
+        Indent for consistency with usual Emacs style.
+
+2011-11-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_window): If cursor row is not fully visible
+        after recentering, and scroll-conservatively is set to a large
+        number, scroll window by a few more lines to make the cursor fully
+        visible and out of scroll-margin.  (Bug#10105)
+        (start_display): Don't move to the next line if the display should
+        start at a newline that is part of a display vector or an overlay
+        string.  (Bug#10119)
+
+2011-11-24  Juri Linkov  <juri@jurta.org>
+
+        * image.c (imagemagick_load_image): Move `MagickSetResolution' down
+        after the `MagickPingImage' call.  (Bug#10112)
+
+2011-11-23  Chong Yidong  <cyd@gnu.org>
+
+        * window.c (Fcoordinates_in_window_p): Accept only live windows.
+
+2011-11-23  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffer.c (Fkill_buffer): Run replace_buffer_in_windows before
+        making another buffer current.  (Bug#10114)
+
+2011-11-23  Glenn Morris  <rgm@gnu.org>
+
+        * font.c (font_find_for_lface) [HAVE_NS]: Ignore case.  (Bug#2526)
+
+2011-11-23  Chong Yidong  <cyd@gnu.org>
+
+        * xdisp.c (compute_stop_pos): Check validity of end_charpos before
+        using it (Bug#5984).
+
+2011-11-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispnew.c (adjust_glyph_matrix): Don't verify hash code of mode-
+        and header-lines, as they don't have one computed for them.
+        (Bug#10098)
+
+        * .gdbinit (prow): Make displayed values more self-explaining.
+        Add row's hash code.
+
 2011-11-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * process.c (wait_reading_process_output): Fix asynchrounous
@@ -7075,7 +7232,7 @@
 
 2011-04-08  T.V. Raman  <tv.raman.tv@gmail.com>  (tiny change)
 
-        * xml.c (parse_region): Avoid creating spurious whiespace nodes.
+        * xml.c (parse_region): Avoid creating spurious whitespace nodes.
 
 2011-04-08  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -7691,7 +7848,7 @@
         * keyboard.c (Fcommand_execute, Fsuspend_emacs, safe_run_hooks_1):
         Use Frun_hooks.
         (command_loop_1): Use Frun_hooks.  Call safe_run_hooks
-        unconditionnaly since it does the check itself.
+        unconditionally since it does the check itself.
 
 2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -8575,7 +8732,7 @@
         (xg_set_widget_bg): New function.
         (delete_cb): New function.
         (xg_create_frame_widgets): Connect delete-event to delete_cb.
-        Call xg_set_widget_bg.  Only set backgrund pixmap for ! HAVE_GTK3
+        Call xg_set_widget_bg.  Only set background pixmap for ! HAVE_GTK3
         (xg_set_background_color): Call xg_set_widget_bg.
         (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask.
         (xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3.