diff options
| author | Richard M. Stallman <rms@gnu.org> | 1997-08-07 09:01:52 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1997-08-07 09:01:52 +0000 |
| commit | f1dfb9916d56ad2790ad1599a62542ccd344805b (patch) | |
| tree | 60dd398544168e6b72fee785b4f2e2f83efd5153 /src/indent.c | |
| parent | b3b5eea2c15c04422690de8b4ef470a053158805 (diff) | |
| download | emacs-f1dfb9916d56ad2790ad1599a62542ccd344805b.tar.gz | |
(current_column): Update ptr differently at newline
so that current_column_bol_cache is set properly.
Diffstat (limited to 'src/indent.c')
| -rw-r--r-- | src/indent.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/indent.c b/src/indent.c index 5b51e405b6a..a6fa7a92420 100644 --- a/src/indent.c +++ b/src/indent.c @@ -349,10 +349,12 @@ current_column () col += XVECTOR (DISP_CHAR_VECTOR (dp, c))->size; else if (c >= 040 && c < 0177) col++; - else if (c == '\n') - break; - else if (c == '\r' && EQ (current_buffer->selective_display, Qt)) - break; + else if (c == '\n' + || (c == '\r' && EQ (current_buffer->selective_display, Qt))) + { + ptr++; + break; + } else if (c == '\t') { if (tab_seen) @@ -375,7 +377,7 @@ current_column () if (ptr == BEGV_ADDR) current_column_bol_cache = BEGV; else - current_column_bol_cache = PTR_CHAR_POS ((ptr+1)); + current_column_bol_cache = PTR_CHAR_POS (ptr); last_known_column = col; last_known_column_point = PT; last_known_column_modified = MODIFF; |