procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle patch terminators produced by git and bzr patch export

Browse source 
Patch by Juri Linkov posted in the #9597 bug report

* lisp/vc/diff-mode.el (diff-sanity-check-hunk): Find and ignore
terminator (Bug #9597, #5302)
This commit is contained in:
Dima Kogan 2017-01-30 21:43:32 -08:00
parent fbf74c158e
commit 189df8262e
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lisp/vc/diff-mode.el
View file

@ -437,6 +437,9 @@ See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html")
(defconst diff-hunk-header-re
(concat "^\\(?:" diff-hunk-header-re-unified ".*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$"))
(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* \n]\\).+\n" (substring diff-hunk-header-re 1)))
(defconst diff-separator-re "^--+ ?$")
(defvar diff-narrowed-to nil)
(defun diff-hunk-style (&optional style)
@ -1537,15 +1540,20 @@ Only works for unified diffs."
(pcase (char-after)
(?\s (cl-decf before) (cl-decf after) t)
(?-
(if (and (looking-at diff-file-header-re)
(zerop before) (zerop after))
;; No need to query: this is a case where two patches
;; are concatenated and only counting the lines will
;; give the right result. Let's just add an empty
;; line so that our code which doesn't count lines
;; will not get confused.
(progn (save-excursion (insert "\n")) nil)
(cl-decf before) t))
(cond
((and (looking-at diff-separator-re)
(zerop before) (zerop after))
nil)
((and (looking-at diff-file-header-re)
(zerop before) (zerop after))
;; No need to query: this is a case where two patches
;; are concatenated and only counting the lines will
;; give the right result. Let's just add an empty
;; line so that our code which doesn't count lines
;; will not get confused.
(save-excursion (insert "\n")) nil)
(t
(cl-decf before) t)))
(?+ (cl-decf after) t)
(_
(cond