Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0

1 files changed, 37 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dc6a1641ac5..73436b217a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2006-02-08  Miles Bader  <miles@gnu.org>
+
+        * editfns.c (Fconstrain_to_field): Use Fget_char_property instead
+        of Fget_text_property (other field functions word with overlays as
+        well as text-properties).
+
+2006-02-07  Kenichi Handa  <handa@m17n.org>
+
+        * dispextern.h (unibyte_display_via_language_environment): Extern it.
+
+        * xterm.h (unibyte_display_via_language_environment):
+        * w32term.h (unibyte_display_via_language_environment):
+        * macterm.h (unibyte_display_via_language_environment): Delete extern.
+
+2006-02-07  Kenichi Handa  <handa@m17n.org>
+
+        * term.c (append_glyph): Refer to it->char_to_display instead of it->c.
+        (produce_glyphs): Set the character to print in
+        it->char_to_display.  Handle unibyte-display-via-language-environment.
+        (produce_stretch_glyph): Set character to print in it->char_to_display.
+
+2006-02-06  Kenichi Handa  <handa@m17n.org>
+
+        * lread.c (openp): Initialize encoded_fn before GCPRO it.
+
+2006-02-05  Ken Raeburn  <raeburn@raeburn.org>
+
+        * editfns.c (Fconstrain_to_field): Fix int/Lisp_Object mixup.
+
+        * lisp.h (XPNTR) [!NO_UNION_TYPE && !HAVE_SHM && !DATA_SEG_BITS]:
+        Cast bitfield value to EMACS_INT, to suppress gcc warning.
+
+        * xrdb.c (malloc, realloc, free) [emacs]: Undefine macros before
+        defining.
+
 2006-02-03  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c: Cache last merged escape glyph face.
@@ -22394,7 +22429,8 @@ See ChangeLog.9 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005,
+        2006 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.