merge trunk

1 files changed, 91 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 760bf575da5..69e3eda2630 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -24,13 +24,92 @@
         (encode_coding_iso_2022, encode_coding_sjis)
         (encode_coding_big5, encode_coding_charset): Use the above macros.
 
+2011-12-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lisp.h (process_quit_flag): Fix external declaration.
+
+2011-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Don't macro-inline non-performance-critical code.
+        * eval.c (process_quit_flag): New function.
+        * lisp.h (QUIT): Use it.
+
+2011-12-04  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (get_geometry_from_preferences): New function.
+        (Fx_create_frame): Call get_geometry_from_preferences (Bug#10103).
+
+2011-12-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs.c (Qkill_emacs): Define.
+        (syms_of_emacs): Initialize it.
+        * keyboard.c (interrupt_signal): Don't call Fkill_emacs here, set
+        Qquit_flag to `kill-emacs' instead.
+        (quit_throw_to_read_char): Add parameter `from_signal'.
+        All callers changed.  Call Fkill_emacs if requested and safe.
+        * lisp.h (QUIT): Call Fkill_emacs if requested.
+
+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
+        (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>
@@ -67,8 +146,8 @@
 
 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
+        * 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>
@@ -275,8 +354,8 @@
         * xdisp.c (display_line): Move the call to
         highlight_trailing_whitespace before the call to
         compute_line_metrics, since the latter needs to see the final
-        faces of all the glyphs to compute ROW's hash value.  Fixes
-        assertion violations in row_equal_p.  (Bug#10035)
+        faces of all the glyphs to compute ROW's hash value.
+        Fixes assertion violations in row_equal_p.  (Bug#10035)
 
 2011-11-14  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -360,8 +439,8 @@
 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_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.
 
@@ -493,8 +572,8 @@
         (x_destroy_window): Move code to x_free_frame_resources.
 
         * xfns.c (unwind_create_frame): Fix comment.
-        (Fx_create_frame, x_create_tip_frame): Move
-        terminal->reference_count++ just before making the frame
+        (Fx_create_frame, x_create_tip_frame):
+        Move terminal->reference_count++ just before making the frame
         official. Move initialization of image_cache_refcount and
         dpyinfo_refcount before calling init_frame_faces (Bug#9943).
 
@@ -564,8 +643,8 @@
         * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
         Don't stop backward scan on the continuation glyph, even though
         its CHARPOS is positive.
-        (mouse_face_from_buffer_pos, note_mouse_highlight): Rename
-        cover_string to disp_string.
+        (mouse_face_from_buffer_pos, note_mouse_highlight):
+        Rename cover_string to disp_string.
 
 2011-11-01  Martin Rudalics  <rudalics@gmx.at>
 
@@ -8704,7 +8783,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.