Mercurial > emacs

diff src/ChangeLog @ 83467:d04d8ccb3c41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-41 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-42 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-43 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-44 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-45 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-46 Merge from erc--emacs--0 * emacs@sv.gnu.org/emacs--devo--0--patch-47 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-48 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-14 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-15 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-16 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-17 Merge from emacs--devo--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 06 Feb 2006 18:44:57 +0000
parents 38d9a9de1e9c
children 459c112bf4eb
line wrap: on
line diff
--- a/src/ChangeLog	Fri Feb 03 15:24:23 2006 +0000
+++ b/src/ChangeLog	Mon Feb 06 18:44:57 2006 +0000
@@ -1,3 +1,24 @@
+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.
+	(last_escape_glyph_frame, last_escape_glyph_face_id)
+	(last_escape_glyph_merged_face_id): New variables.
+	(get_next_display_element): Use/update them.
+	(redisplay_internal): Reset them before redisplay.
+
+	* xdisp.c (set_iterator_to_next): Optimize 2004-12-13 fix.
+	Only recheck faces after displaying ellipsis.
+
 2006-02-02  Kenichi Handa  <handa@m17n.org>
 
 	* coding.c (decode_composition_emacs_mule): Fix handling of