diff options
| author | Glenn Morris | 2013-02-08 09:23:24 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-02-08 09:23:24 -0800 |
| commit | 078891963d172f00c9866427683e486984d2d0e1 (patch) | |
| tree | ab82d4e6068776b226a5615688e1af1da62e3f30 /src | |
| parent | 7f526211ba8dcdc6f950a5d9857e8b9247b3cfb1 (diff) | |
| parent | 90790560581cfcb7728e1ce2094b4f42dd381192 (diff) | |
| download | emacs-078891963d172f00c9866427683e486984d2d0e1.tar.gz emacs-078891963d172f00c9866427683e486984d2d0e1.zip | |
Merge from emacs-24; up to 2012-12-14T21:27:39Z!rgm@gnu.org
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index a958fd51e39..02f2ae5d961 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -21577,11 +21577,15 @@ decode_mode_spec (struct window *w, register int c, int field_width, | |||
| 21577 | } | 21577 | } |
| 21578 | 21578 | ||
| 21579 | 21579 | ||
| 21580 | /* Count up to COUNT lines starting from START_BYTE. | 21580 | /* Count up to COUNT lines starting from START_BYTE. COUNT negative |
| 21581 | But don't go beyond LIMIT_BYTE. | 21581 | means count lines back from START_BYTE. But don't go beyond |
| 21582 | Return the number of lines thus found (always nonnegative). | 21582 | LIMIT_BYTE. Return the number of lines thus found (always |
| 21583 | 21583 | nonnegative). | |
| 21584 | Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */ | 21584 | |
| 21585 | Set *BYTE_POS_PTR to the byte position where we stopped. This is | ||
| 21586 | either the position COUNT lines after/before START_BYTE, if we | ||
| 21587 | found COUNT lines, or LIMIT_BYTE if we hit the limit before finding | ||
| 21588 | COUNT lines. */ | ||
| 21585 | 21589 | ||
| 21586 | static ptrdiff_t | 21590 | static ptrdiff_t |
| 21587 | display_count_lines (ptrdiff_t start_byte, | 21591 | display_count_lines (ptrdiff_t start_byte, |