diff options
| author | Karoly Lorentey <[email protected]> | 2006-06-12 07:27:12 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-06-12 07:27:12 +0000 |
| commit | 476e9367ec1f440aa23904b7bc482ea4a3b8041c (patch) | |
| tree | 4f7f5a5e9a6668f908834bb6e216c8fa3727d4b3 /src/dispextern.h | |
| parent | a13f8f50d4cc544d3bbfa78568e82ce09e68bded (diff) | |
| parent | 6b519504c3297595101628e823e72c91e562ab45 (diff) | |
Merged from [email protected].
Patches applied:
* [email protected]/emacs--devo--0--patch-294
Update from CVS
* [email protected]/emacs--devo--0--patch-295
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-296
Update from CVS: admin/FOR-RELEASE: Update refcard section.
* [email protected]/emacs--devo--0--patch-297
Update from CVS
* [email protected]/emacs--devo--0--patch-298
Update from CVS
* [email protected]/emacs--devo--0--patch-299
Update from CVS
* [email protected]/emacs--devo--0--patch-300
Update from CVS
* [email protected]/emacs--devo--0--patch-301
Update from CVS
* [email protected]/emacs--devo--0--patch-302
Update from CVS
* [email protected]/emacs--devo--0--patch-303
Update from CVS
* [email protected]/emacs--devo--0--patch-304
Update from CVS
* [email protected]/gnus--rel--5.10--patch-103
Update from CVS
* [email protected]/gnus--rel--5.10--patch-104
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-570
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index c836bc751d..ed91d2df76 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2623,8 +2623,8 @@ void remember_mouse_glyph P_ ((struct frame *, int, int, NativeRectangle *)); void mark_window_display_accurate P_ ((Lisp_Object, int)); void redisplay_preserve_echo_area P_ ((int)); -void set_cursor_from_row P_ ((struct window *, struct glyph_row *, - struct glyph_matrix *, int, int, int, int)); +int set_cursor_from_row P_ ((struct window *, struct glyph_row *, + struct glyph_matrix *, int, int, int, int)); void init_iterator P_ ((struct it *, struct window *, int, int, struct glyph_row *, enum face_id)); void init_iterator_to_row_start P_ ((struct it *, struct window *, @@ -2682,8 +2682,8 @@ extern void x_fix_overlapping_area P_ ((struct window *, struct glyph_row *, extern void draw_phys_cursor_glyph P_ ((struct window *, struct glyph_row *, enum draw_glyphs_face)); -extern int get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *, - struct glyph *, int *)); +extern void get_phys_cursor_geometry P_ ((struct window *, struct glyph_row *, + struct glyph *, int *, int *, int *)); extern void erase_phys_cursor P_ ((struct window *)); extern void display_and_set_cursor P_ ((struct window *, int, int, int, int, int)); |