Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 18:37:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Bug#25524

Browse source 
* lisp/vc/diff-mode.el (diff-beginning-of-hunk):
Return position at the beginning off the hunk.
(diff-file-junk-re): Add SVN keywords.
This commit is contained in:
Tino Calancha 2017-01-29 18:49:10 +09:00
parent d12e1ddf42
commit 0073223c23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -501,7 +501,8 @@ See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html")
;; "index ", "old mode", "new mode", "new file mode" and
;; "deleted file mode" are output by git-diff.
(defconst diff-file-junk-re
"diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")
(concat "Index: \\|=\\{20,\\}\\|" ; SVN
"diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file"))
;; If point is in a diff header, then return beginning
;; of hunk position otherwise return nil.
@ -545,7 +546,8 @@ next hunk if TRY-HARDER is non-nil; otherwise signal an error."
(error "Can't find the beginning of the hunk")))
((re-search-backward regexp nil t)) ; In the middle of a hunk.
((re-search-forward regexp nil t) ; At first hunk header.
(forward-line 0))
(forward-line 0)
(point))
(t (error "Can't find the beginning of the hunk"))))))
(defun diff-unified-hunk-p ()