Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-153
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-154
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-155
   Remove nick-abbrevs stuff from rcirc.el

 * emacs@sv.gnu.org/emacs--devo--0--patch-156
   rcirc.el update from Ryan Yeske

 * emacs@sv.gnu.org/emacs--devo--0--patch-157
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-158
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-159
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-532

1 files changed, 59 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 389538b1617..f6edc410276 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,61 @@
+2006-03-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xterm.c (x_uncatch_errors): Block input for entire function.
+
+2006-03-12  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (Fx_create_frame): Remove call to
+        Qface_set_after_frame_default. (from xfns.c 2003-05-26)
+
+        * w32menu.c (Fx_popup_menu): Call w32_free_menu_strings when
+        finished with the menu.
+
+        * w32term.c: Sync 2005-10-24 xterm.c changes.
+        (last_mouse_glyph_frame): New var.
+        (note_mouse_movement): Say mouse moved if current frame differs
+        from last_mouse_glyph_frame, and update last_mouse_glyph_frame.
+        (w32_mouse_position): Set last_mouse_glyph_frame.
+         Remove OLD_REDISPLAY_CODE block.
+
+2006-03-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macgui.h [USE_ATSUI && MAC_OSX]: Define USE_CG_TEXT_DRAWING to 1.
+
+        * macterm.h (struct mac_output) [USE_CG_DRAWING]: New member cg_context.
+        (mac_prepare_for_quickdraw) [USE_CG_DRAWING]: Add prototype.
+
+        * mac.c (sys_select) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.
+
+        * macfns.c (x_create_tip_frame): Apply 2006-03-11 change for xfns.c.
+
+        * macterm.c (mac_draw_rectangle, x_draw_glyph_string_foreground)
+        (x_draw_composite_glyph_string_foreground)
+        (x_draw_image_foreground): Undo previous changes.
+        (x_draw_hollow_cursor): Likewise.  Subtract 1 from the last
+        argument of mac_draw_rectangle.
+        (CG_SET_FILL_COLOR, CG_SET_STROKE_COLOR): New macros.
+        (mac_draw_string_common, mac_draw_image_string_cg): Use them.
+        (FRAME_CG_CONTEXT) [USE_CG_DRAWING]: New macro.
+        (mac_begin_cg_clip, mac_end_cg_clip, mac_prepare_for_quickdraw)
+        [USE_CG_DRAWING]: New functions.
+        (mac_draw_line, mac_erase_rectangle, mac_clear_window)
+        (mac_fill_rectangle, mac_draw_rectangle, mac_draw_string_common)
+        (mac_draw_image_string_cg) [USE_CG_DRAWING]: Add Quartz 2D drawing part.
+        (mac_draw_bitmap, mac_invert_rectangle, mac_draw_string_common)
+        (mac_copy_area, mac_scroll_area, x_scroll_bar_create)
+        (x_scroll_bar_remove, XTset_vertical_scroll_bar, x_set_window_size)
+        (XTread_socket) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.
+
+2006-03-12  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+
+        * xfns.c (x_icon): Disable redundant call to `x_wm_set_window_state'.
+
+2006-03-11  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (signal_user_input): New function.
+        (post_character_message): Use it for keyboard input.
+        (w32_msg_pump): Use it for mouse input.
+
 2006-03-11  Luc Teirlinck  <teirllm@auburn.edu>
 
         * window.c: Rename preserve_y to window_scroll_pixel_based_preserve_y.
@@ -95,7 +153,7 @@
 
         * image.c [MAC_OS] (XPutPixel): Set alpha channel bits if pixmap
         depth is 32.
-         [MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap
+        [MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap
         depth is 32.
 
 2006-03-06  Chong Yidong  <cyd@stupidchicken.com>