diff options
| author | Paul Eggert | 2011-11-18 23:22:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-18 23:22:10 -0800 |
| commit | 85a83e2e2585a1906dec5168ed96ad521b5849ed (patch) | |
| tree | 77624c0be0054204da2877e1fabc187175f2dbdf /src | |
| parent | 9898bd0e5b0e51ce9040e11ae25c9a07ec08eb4f (diff) | |
| download | emacs-85a83e2e2585a1906dec5168ed96ad521b5849ed.tar.gz emacs-85a83e2e2585a1906dec5168ed96ad521b5849ed.zip | |
Fix botched merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/indent.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/indent.c b/src/indent.c index 033d258c67e..7e2edc8713b 100644 --- a/src/indent.c +++ b/src/indent.c | |||
| @@ -1680,8 +1680,6 @@ compute_motion (ptrdiff_t from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_ | |||
| 1680 | val_compute_motion.prevhpos = contin_hpos; | 1680 | val_compute_motion.prevhpos = contin_hpos; |
| 1681 | else | 1681 | else |
| 1682 | val_compute_motion.prevhpos = prev_hpos; | 1682 | val_compute_motion.prevhpos = prev_hpos; |
| 1683 | /* We always handle all of them here; none of them remain to do. */ | ||
| 1684 | val_compute_motion.ovstring_chars_done = 0; | ||
| 1685 | 1683 | ||
| 1686 | /* Nonzero if have just continued a line */ | 1684 | /* Nonzero if have just continued a line */ |
| 1687 | val_compute_motion.contin = (contin_hpos && prev_hpos == 0); | 1685 | val_compute_motion.contin = (contin_hpos && prev_hpos == 0); |