gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix display of unmerged paths.

Browse source 
* magit.el (magit-wash-diff-section): Pick out 'file' from match data.
This commit is contained in:
Marius Vollmer 2009-06-21 22:09:35 +03:00
parent 46b462bc24
commit aac73da95d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
magit.el
View file

@ -1471,10 +1471,11 @@ Please see the manual for a complete description of Magit.
(defun magit-wash-diff-section () (defun magit-wash-diff-section ()
(cond ((looking-at "^\\* Unmerged path \\(.*\\)") (cond ((looking-at "^\\* Unmerged path \\(.*\\)")
(let ((file (match-string-no-properties 1)))
(delete-region (point) (line-end-position)) (delete-region (point) (line-end-position))
(insert "\tUnmerged " file "\n") (insert "\tUnmerged " file "\n")
(magit-set-section-info (list 'unmerged file nil)) (magit-set-section-info (list 'unmerged file nil))
t) t))
((looking-at "^diff") ((looking-at "^diff")
(let ((file (magit-diff-line-file)) (let ((file (magit-diff-line-file))
(end (save-excursion (end (save-excursion