npostavs@users.sourceforge.net writes: > Dima Kogan writes: > >> npostavs@users.sourceforge.net writes: >> >> Revised patch attached. I'll try to respond to any comments >> quickly so that we all can remember what this is about. > [...] >> - (t (error "No hunk found")))))) >> + ;; There's no next hunk, so just take the one we have >> + (t (list beg end)))))) > > Indentation on the comment looks a bit off. This file used tabs in some places and spaces in others. Indentation updated to match. >> + >> + ;; I advance to the next hunk interactively because I want the >> + ;; interactive behavior of moving to the next logical hunk, not >> + ;; the legacy behavior where were would sometimes sty on the >> + ;; curent hunk. See http://debbugs.gnu.org/17544 >> (when diff-advance-after-apply-hunk >> - (diff-hunk-next)))))) >> + (diff-hunk-next nil t)))))) > > Updating the comment here will be useful for the next person trying to > figure out what this is all about in a couple more years. done >> (hunk (delete-and-extract-region >> - (point) (save-excursion (diff-end-of-hunk) (point)))) >> + (point) (cadr hunk-bounds))) > > Indentation looks off here. Same as above.