Mercurial > emacs
comparison src/dispnew.c @ 83271:1830bcd0eec0
Merged from miles@gnu.org--gnu-2005 (patch 39-44, 184-191)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-184
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-185
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-186
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-187
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-188
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-189
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-190
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-191
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-39
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-40
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-41
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-42
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-43
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-44
Merge from emacs--cvs-trunk--0
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-311
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 19 Mar 2005 17:55:13 +0000 |
parents | 267c2ab562ab 18bf961ed63a |
children | 9deb6323655c |
comparison
equal
deleted
inserted
replaced
83270:42406ecdf5bf | 83271:1830bcd0eec0 |
---|---|
3151 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); | 3151 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f)); |
3152 struct window *w2; | 3152 struct window *w2; |
3153 struct glyph_matrix *m2; | 3153 struct glyph_matrix *m2; |
3154 int m2_from; | 3154 int m2_from; |
3155 | 3155 |
3156 w2 = frame_row_to_window (root, frame_to); | 3156 w2 = frame_row_to_window (root, frame_from); |
3157 m2 = w2->current_matrix; | 3157 m2 = w2->current_matrix; |
3158 m2_from = frame_from - m2->matrix_y; | 3158 m2_from = frame_from - m2->matrix_y; |
3159 copy_row_except_pointers (m->rows + window_to, | 3159 copy_row_except_pointers (m->rows + window_to, |
3160 m2->rows + m2_from); | 3160 m2->rows + m2_from); |
3161 | 3161 |