Merged from emacs@sv.gnu.org

Patches applied:

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-106
   Merge from gnus--rel--5.10

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

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

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

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

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-37
   Update from CVS

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

1 files changed, 80 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f2a6e1e2752..c016dc46e4b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,83 @@
+2006-02-21  Kim F. Storm  <storm@cua.dk>
+
+        * fringe.c (syms_of_fringe) <fringe-bitmaps>: Doc fix.
+
+2006-02-21  Zhang Wei <brep@newsmth.org>
+
+        * xfns.c (Fx_file_dialog, Motif and GTK): DECODE_FILE before
+        returning it.
+
+2006-02-21  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+        * fringe.c (horizontal_bar_bits): Rename from `horisontal_bar_bits'.
+        (standard_bitmaps): Use it.
+
+2006-02-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (mac_draw_string_common): Remove arg MODE.  New arg
+        BG_WIDTH.  All uses changed.  Draw background if BG_WIDTH is not zero.
+        (mac_draw_image_string, mac_draw_image_string_16): New arg BG_WIDTH.
+        [USE_CG_TEXT_DRAWING] (mac_draw_image_string_cg): Rename from
+        mac_draw_string_cg.  New arg BG_WIDTH.  All uses changed.  Draw
+        background if BG_WIDTH is not zero.  Use float constants as
+        divisors instead of double.  Use alloca instead of xmalloc/xfree.
+        (x_draw_glyph_string_background, x_draw_glyph_string_foreground)
+        [!MAC_OS8 || USE_ATSUI]: Background may be drawn using
+        mac_draw_image_string* functions.
+        (XLoadQueryFont) [MAC_OS8 && USE_ATSUI]: Don't adjust heights of
+        some fonts when srcCopy text transfer mode might be used.
+        (mac_begin_clip, mac_end_clip): Check if region is empty.
+        (mac_set_clip_rectangles): When resetting clip region, make it
+        empty instead of disposing of it.
+
+2006-02-20  Kim F. Storm  <storm@cua.dk>
+
+        * Makefile.in: Add fringe.elc to WINDOW_SUPPORT.
+
+        * buffer.h (struct buffer): New members fringe_indicator_alist and
+        fringe_cursor_alist.
+
+        * buffer.c (init_buffer_once): Set dummy default values for
+        fringe-indicator-alist and fringe-cursor-alist.  The proper
+        default values are set by pre-loading fringe.el.
+        (syms_of_buffer): defvar_per_buffer new fringe-indicator-alist and
+        fringe-cursor-alist buffer-local variables and defvar_lisp_nopro
+        corresponding default- variables.
+
+        * fringe.c (enum fringe_bitmap_type): Remove.  Change all uses
+        to use `int'.
+        (NO_FRINGE_BITMAP, UNDEF_FRINGE_BITMAP, MAX_STANDARD_FRINGE_BITMAPS):
+        Define explicitly.
+        (Qtruncation, Qcontinuation, Qempty_line, Qtop_bottom)
+        (Qhollow_small): New variables.
+        (syms_of_fringe): Intern and staticpro them.
+        (question_mark_bits): Rename from unknown_bits.
+        (left_curly_arrow_bits): Rename from continuation_bits.
+        (right_curly_arrow_bits): Rename from continued_bits.
+        (left_triangle_bits): Rename from ov_bits.
+        (right_triangle_bits): Added.
+        (filled_rectangle_bits): Rename from filled_box_cursor_bits.
+        (hollow_rectangle_bits): Rename from hollow_box_cursor_bits.
+        (filled_square_bits): Added.
+        (vertical_bar_bits): Rename from bar_cursor_bits.
+        (horizontal_bar_bits): Rename from hbar_cursor_bits.
+        (empty_line_bits): Rename from zv_bits.
+        (standard_bitmaps): Update to use new names.
+        (draw_fringe_bitmap_1): Make static.
+        (get_logical_cursor_bitmap, get_logical_fringe_bitmap): New functions
+        to map from logical cursors and indicators to physical bitmaps.
+        (draw_fringe_bitmap): Resolve fringe cursor and overlay-arrow
+        bitmaps using symbol names instead of bitmap numbers.
+        (update_window_fringes): Use logical indicator symbol names
+        instead of bitmap numbers for logical.  Add bitmap cache.
+        (LEFT_FRINGE, RIGHT_FRINGE): New helper macros.
+
+2006-02-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * regex.c: Revert 2006-02-19 change.
+        (xmalloc, xrealloc): Define these when not linked to Emacs.
+        Redefine malloc -> xmalloc, realloc -> xrealloc as in Emacs case.
+
 2006-02-19  Luc Teirlinck  <teirllm@auburn.edu>
 
         * regex.c (extend_range_table_work_area): Fix typo.