--- a/contrib/mercurial.el	Tue Jun 27 11:32:37 2006 -0700
+++ b/contrib/mercurial.el	Thu Jun 29 10:27:09 2006 -0700
@@ -653,7 +653,7 @@
 you're already familiar with VC, the same keybindings and functions
 will generally work.
 
-Below is a list of many common SCM tasks.  In the list, `G/L'
+Below is a list of many common SCM tasks.  In the list, `G/L\'
 indicates whether a key binding is global (G) to a repository or local
 (L) to a file.  Many commands take a prefix argument.
 
@@ -682,7 +682,9 @@
 Update working directory after pull   G    C-c h u      hg-update
 See changes that can be pushed        G    C-c h .      hg-outgoing
 Push changes                          G    C-c h >      hg-push"
-  (run-hooks 'hg-mode-hook))
+  (unless vc-make-backup-files
+    (set (make-local-variable 'backup-inhibited) t))
+    (run-hooks 'hg-mode-hook))
 
 (defun hg-find-file-hook ()
   (when (hg-mode-line)
@@ -729,6 +731,8 @@
       (goto-char 0)
       (cd (hg-root path)))
     (when update
+      (unless vc-make-backup-files
+	(set (make-local-variable 'backup-inhibited) t))
       (with-current-buffer buf
 	(hg-mode-line)))))
 
@@ -968,6 +972,7 @@
       (cd (hg-root path)))
     (when update
       (with-current-buffer buf
+	(set (make-local-variable 'backup-inhibited) nil)
 	(hg-mode-line)))))
 
 (defun hg-incoming (&optional repo)