# HG changeset patch
# User NIIMI Satoshi <sa2c@sa2c.net>
# Date 1192050645 -32400
# Node ID 521284cdbcb4d482f71b5a84ed5335833b96172d
# Parent  87860c62e0031dfc03bf6806091acd9d3a644f18
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs

diff --git a/contrib/mercurial.el b/contrib/mercurial.el
--- a/contrib/mercurial.el
+++ b/contrib/mercurial.el
@@ -666,7 +666,11 @@ This is useful across reverts and merges
 to have moved a little, but not really changed."
   (let ((point-context (hg-position-context (point)))
 	(mark-context (let ((mark (mark-marker)))
-			(and mark (hg-position-context mark)))))
+			(and mark
+			     ;; make sure active mark
+			     (marker-buffer mark)
+			     (marker-position mark)
+			     (hg-position-context mark)))))
     (list point-context mark-context)))
 
 (defun hg-find-context (ctx)