CVS update by scop packages/xemacs-packages/vc ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 07/10/28 18:48:03

  Modified:    packages/xemacs-packages/vc ChangeLog mercurial.el
Log:
Sync mercurial.el with upstream

Revision  Changes    Path
1.54      +2 -0      XEmacs/packages/xemacs-packages/vc/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vc/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ChangeLog	2007/10/28 17:46:57	1.53
+++ ChangeLog	2007/10/28 17:48:02	1.54
@@ -1,5 +1,7 @@
 2007-10-28  Ville Skyttä  <scop at xemacs.org>
 
+	* mercurial.el: Sync with upstream.
+
 	* vc-hooks.el (vc-user-login-name): Use tramp directly, we don't
 	have `process-file' in XEmacs.  Warning: it is known that this
 	approach only works with tramp 2.0 (not 2.1).



1.2       +6 -2      XEmacs/packages/xemacs-packages/vc/mercurial.el

Index: mercurial.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vc/mercurial.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mercurial.el	2007/08/23 21:27:52	1.1
+++ mercurial.el	2007/10/28 17:48:02	1.2
@@ -521,7 +521,7 @@ directory names from the file system.  W
 	    (completing-read (format "Revision%s (%s): "
 				     (or prompt "")
 				     (or default "tip"))
-			     (map 'list 'cons revs revs)
+			     (mapcar (lambda (x) (cons x x)) revs)
 			     nil
 			     nil
 			     nil
@@ -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)