Commit d2d818bf authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from mainline.

parents ef3ff036 1aba75c2
......@@ -1118,7 +1118,7 @@ else cover the whole buffer."
(save-excursion
(goto-char end) (diff-end-of-hunk nil 'donttrustheader)
(let ((plus 0) (minus 0) (space 0) (bang 0))
while (and (= (forward-line -1) 0) (<= start (point)))
(while (and (= (forward-line -1) 0) (<= start (point)))
(if (not (looking-at
(concat diff-hunk-header-re-unified
"\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
......@@ -1158,7 +1158,7 @@ else cover the whole buffer."
(concat "%0" (number-to-string (length old)) "d")
(+ space bang minus -1 (string-to-number old)))))
(unless (string= new old) (replace-match new t t nil 2))))))
(setq space 0 plus 0 minus 0 bang 0))))))
(setq space 0 plus 0 minus 0 bang 0)))))))
;;;;
;;;; Hooks
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment