[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107901: Fixes: debbugs:11344

[Andreas Schwab]

------------------------------------------------------------
revno: 107901
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2012-04-26 11:27:37 +0200
message:
  Fixes: debbugs:11344
  
  * vc/vc-git.el (vc-git-state): Fix regexp matching diff output.
modified:
  lisp/ChangeLog
  lisp/vc/vc-git.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-24 05:34:50 +0000
+++ b/lisp/ChangeLog    2012-04-26 09:27:37 +0000
@@ -1,3 +1,8 @@
+2012-04-26  Andreas Schwab  <address@hidden>
+
+       * vc/vc-git.el (vc-git-state): Fix regexp matching diff output.
+       (Bug#11344)
+
 2012-04-24  Chong Yidong  <address@hidden>
 
        * select.el (xselect--encode-string): New function, split from

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2012-03-28 10:12:02 +0000
+++ b/lisp/vc/vc-git.el 2012-04-26 09:27:37 +0000
@@ -220,7 +220,7 @@
     (let ((diff (vc-git--run-command-string
                  file "diff-index" "-p" "--raw" "-z" "HEAD" "--")))
       (if (and diff
-              (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} 
[0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0\\(.\\)?"
+              (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} 
[0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0\\(.*\n.\\)?"
                             diff))
           (let ((diff-letter (match-string 1 diff)))
             (if (not (match-beginning 2))