From: Paul Eggert Date: Sat, 19 Nov 2011 07:22:10 +0000 (-0800) Subject: Fix botched merge. X-Git-Tag: emacs-24.2.90~471^2~6^2~126 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85a83e2e2585a1906dec5168ed96ad521b5849ed;p=emacs.git Fix botched merge. --- 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_ val_compute_motion.prevhpos = contin_hpos; else val_compute_motion.prevhpos = prev_hpos; - /* We always handle all of them here; none of them remain to do. */ - val_compute_motion.ovstring_chars_done = 0; /* Nonzero if have just continued a line */ val_compute_motion.contin = (contin_hpos && prev_hpos == 0);