diff options
| author | Karoly Lorentey | 2004-04-29 20:45:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-04-29 20:45:02 +0000 |
| commit | e6da77e898ea743bc416517542eae446e573b6b5 (patch) | |
| tree | 47df1c81621f456f688132b822fb6f51087b9822 /src/ChangeLog | |
| parent | 9a3ab26af39540424723a27ab3a7f3cd204660c8 (diff) | |
| parent | 016b8f71efe187f403913d47890c8e0408472617 (diff) | |
| download | emacs-e6da77e898ea743bc416517542eae446e573b6b5.tar.gz emacs-e6da77e898ea743bc416517542eae446e573b6b5.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-259
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-260
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-261
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-155
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c3314cb98e5..386c3d99a47 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2004-04-29 Kim F. Storm <storm@cua.dk> | ||
| 2 | |||
| 3 | * xdisp.c (null_glyph_slice): New var. | ||
| 4 | (append_glyph, append_composite_glyph, append_stretch_glyph): | ||
| 5 | Use it to initialize glyph slice. | ||
| 6 | |||
| 1 | 2004-04-27 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2004-04-27 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * xdisp.c (x_produce_glyphs): Fix the proverbial int/Lisp_Object mixup. | 9 | * xdisp.c (x_produce_glyphs): Fix the proverbial int/Lisp_Object mixup. |