Mercurial > emacs
comparison src/indent.h @ 109423:ae5ef13849d8
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 04 Jul 2010 22:11:22 +0000 |
parents | e16f43875a48 |
children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
109422:bcedeeedc5fb | 109423:ae5ef13849d8 |
---|---|
47 from the before and after strings at this position. */ | 47 from the before and after strings at this position. */ |
48 EMACS_INT ovstring_chars_done; | 48 EMACS_INT ovstring_chars_done; |
49 EMACS_INT tab_offset; | 49 EMACS_INT tab_offset; |
50 }; | 50 }; |
51 | 51 |
52 struct position *compute_motion P_ ((EMACS_INT from, EMACS_INT fromvpos, | 52 struct position *compute_motion (EMACS_INT from, EMACS_INT fromvpos, |
53 EMACS_INT fromhpos, int did_motion, | 53 EMACS_INT fromhpos, int did_motion, |
54 EMACS_INT to, EMACS_INT tovpos, | 54 EMACS_INT to, EMACS_INT tovpos, |
55 EMACS_INT tohpos, | 55 EMACS_INT tohpos, |
56 EMACS_INT width, EMACS_INT hscroll, | 56 EMACS_INT width, EMACS_INT hscroll, |
57 EMACS_INT tab_offset, struct window *)); | 57 EMACS_INT tab_offset, struct window *); |
58 struct position *vmotion P_ ((EMACS_INT from, EMACS_INT vtarget, | 58 struct position *vmotion (EMACS_INT from, EMACS_INT vtarget, |
59 struct window *)); | 59 struct window *); |
60 EMACS_INT skip_invisible P_ ((EMACS_INT pos, EMACS_INT *next_boundary_p, | 60 EMACS_INT skip_invisible (EMACS_INT pos, EMACS_INT *next_boundary_p, |
61 EMACS_INT to, Lisp_Object window)); | 61 EMACS_INT to, Lisp_Object window); |
62 | 62 |
63 /* Value of point when current_column was called */ | 63 /* Value of point when current_column was called */ |
64 extern EMACS_INT last_known_column_point; | 64 extern EMACS_INT last_known_column_point; |
65 | 65 |
66 /* Functions for dealing with the column cache. */ | 66 /* Functions for dealing with the column cache. */ |
67 | 67 |
68 /* Return true if the display table DISPTAB specifies the same widths | 68 /* Return true if the display table DISPTAB specifies the same widths |
69 for characters as WIDTHTAB. We use this to decide when to | 69 for characters as WIDTHTAB. We use this to decide when to |
70 invalidate the buffer's column_cache. */ | 70 invalidate the buffer's column_cache. */ |
71 int disptab_matches_widthtab P_ ((struct Lisp_Char_Table *disptab, | 71 int disptab_matches_widthtab (struct Lisp_Char_Table *disptab, |
72 struct Lisp_Vector *widthtab)); | 72 struct Lisp_Vector *widthtab); |
73 | 73 |
74 /* Recompute BUF's width table, using the display table DISPTAB. */ | 74 /* Recompute BUF's width table, using the display table DISPTAB. */ |
75 void recompute_width_table P_ ((struct buffer *buf, | 75 void recompute_width_table (struct buffer *buf, |
76 struct Lisp_Char_Table *disptab)); | 76 struct Lisp_Char_Table *disptab); |
77 | 77 |
78 | 78 |
79 /* arch-tag: f9feb373-5bff-4f4f-9198-94805d00cfd7 | 79 /* arch-tag: f9feb373-5bff-4f4f-9198-94805d00cfd7 |
80 (do not change this comment) */ | 80 (do not change this comment) */ |