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:
Marius Vollmer 2008-08-15 21:33:17 +03:00
parent 207fd6c10f
commit 25b62f6f05

View file

@ -503,7 +503,7 @@ pushed.
(defun magit-hunk-is-conflict-p (info)
(save-excursion
(goto-char (elt info 1))
(looking-at-p "^diff --cc")))
(looking-at "^diff --cc")))
(defun magit-diff-conflict-file (info)
(save-excursion