diff options
author | Miles Bader <miles@gnu.org> | 2005-01-22 21:39:38 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-01-22 21:39:38 +0000 |
commit | 18643d1d412928c57690271c8b7a65e50503441f (patch) | |
tree | a9303ce501314fc316c20ca29928b2fa168d0421 /src/fringe.c | |
parent | cfa4901a57cc9920eec0401d8b33abac7d3f8e5b (diff) | |
parent | ddff82cf89b20912729a1483da3f28608b44115a (diff) | |
download | emacs-18643d1d412928c57690271c8b7a65e50503441f.tar.gz emacs-18643d1d412928c57690271c8b7a65e50503441f.tar.bz2 emacs-18643d1d412928c57690271c8b7a65e50503441f.zip |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-4
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-41
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-46
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-47
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-4
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-5
Update from CVS: exi/gnus-faq.texi ([4.1]): Typo.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-6
Update from CVS
Diffstat (limited to 'src/fringe.c')
-rw-r--r-- | src/fringe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fringe.c b/src/fringe.c index 76908907a03..771e7d4787c 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1301,7 +1301,7 @@ If BITMAP already exists, the existing definition is replaced. */) = ((struct fringe_bitmap **) xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *))); fringe_faces - = (unsigned *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object)); + = (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object)); for (; i < max_fringe_bitmaps; i++) { @@ -1472,7 +1472,7 @@ init_fringe () fringe_bitmaps = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *)); fringe_faces - = (unsigned *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object)); + = (Lisp_Object *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object)); for (i = 0; i < max_fringe_bitmaps; i++) { |