[Emacs-diffs] master 0073223: Fix Bug#25524

[Tino Calancha]

branch: master
commit 0073223c23749ffd6bd3f882bc30a82cc37efd2a
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>

    Fix Bug#25524
    
    * lisp/vc/diff-mode.el (diff-beginning-of-hunk):
    Return position at the beginning off the hunk.
    (diff-file-junk-re): Add SVN keywords.
---
 lisp/vc/diff-mode.el |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index b7ad8e8..e609ca9 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -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 ()