Make it work with Emacs 22.
* magit.el (magit-hunk-is-conflict-p): Use looking-at instead of looking-at-p, which is only available in Emacs 23.
This commit is contained in:
parent
207fd6c10f
commit
25b62f6f05
1 changed files with 1 additions and 1 deletions
2
magit.el
2
magit.el
|
@ -503,7 +503,7 @@ pushed.
|
||||||
(defun magit-hunk-is-conflict-p (info)
|
(defun magit-hunk-is-conflict-p (info)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char (elt info 1))
|
(goto-char (elt info 1))
|
||||||
(looking-at-p "^diff --cc")))
|
(looking-at "^diff --cc")))
|
||||||
|
|
||||||
(defun magit-diff-conflict-file (info)
|
(defun magit-diff-conflict-file (info)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
|
|
Loading…
Reference in a new issue