From 25b62f6f05f27baf710d360764fa1d913adf8d41 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Fri, 15 Aug 2008 21:33:17 +0300 Subject: [PATCH] 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. --- magit.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magit.el b/magit.el index e53968e1..322cc348 100644 --- a/magit.el +++ b/magit.el @@ -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