From 550739981d6ec90f629bed9068e83b01d162082e Mon Sep 17 00:00:00 2001
From: Jonathan Kamens <jik@curl.com>
Date: Wed, 18 Jul 2007 12:14:09 -0800
Subject: [PATCH] Minor bug fixes from Dan Nicolaescu <dann@ics.uci.edu>.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 5986]
---
 p4-lowlevel.el |  2 +-
 vc-p4.el       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/p4-lowlevel.el b/p4-lowlevel.el
index 9f3d8a4..b13a0b0 100644
--- a/p4-lowlevel.el
+++ b/p4-lowlevel.el
@@ -394,7 +394,7 @@ value with `-m'; if S-VAL is non-nil, pass that value with `-s'."
 	(l-list (if l-flag (list "-l")))
 	(m-list (if m-val (list "-m" (if (numberp m-val)
 					 (number-to-string m-val)
-				       mval))))
+				       m-val))))
 	(s-list (if s-val (list "-s" s-val))))
     (p4-lowlevel-command-or-error (append
 				   (list "changes")
diff --git a/vc-p4.el b/vc-p4.el
index f82d368..d721c96 100644
--- a/vc-p4.el
+++ b/vc-p4.el
@@ -57,6 +57,10 @@
 (eval-when-compile
   (require 'vc-hooks)
   (require 'vc)
+  (require 'ediff))
+;; FIXME: setq ediff-quit-hook maybe should be add-hook...
+
+(eval-and-compile
   (require 'p4-lowlevel))
 
 (if (not (memq 'P4 vc-handled-backends))
@@ -72,7 +76,7 @@
 
   (defun vc-default-show-log-entry (backend ver)
     (if (fboundp 'log-view-goto-rev)
-	(log-view-goto-rev rev)))
+	(log-view-goto-rev ver)))
   
   (defun vc-print-log ()
     "List the change log of the current buffer in a window."
@@ -259,7 +263,7 @@ The conflicts must be marked with rcsmerge conflict markers."
       (save-excursion
 	(set-buffer your-buffer)
 	(erase-buffer)
-	(insert-buffer result-buffer)
+	(insert-buffer-substring result-buffer)
 	(if (not (vc-call-backend backend 'resolve-select-yours))
 	    (progn
 	      (kill-buffer your-buffer)
@@ -269,12 +273,12 @@ The conflicts must be marked with rcsmerge conflict markers."
       
 	(set-buffer other-buffer)
 	(erase-buffer)
-	(insert-buffer result-buffer)
+	(insert-buffer-substring result-buffer)
 	(vc-call-backend backend 'resolve-select-theirs)
 
 	(set-buffer ancestor-buffer)
 	(erase-buffer)
-	(insert-buffer result-buffer)
+	(insert-buffer-substring result-buffer)
 	(goto-char (point-min))
 	(if (not (vc-call-backend backend 'resolve-select-original))
 	    (progn
@@ -310,7 +314,7 @@ The conflicts must be marked with rcsmerge conflict markers."
 		    (ediff-cleanup-mess)
 		    (set-buffer result)
 		    (erase-buffer)
-		    (insert-buffer buffer-C)
+		    (insert-buffer-substring buffer-C)
 		    (kill-buffer buffer-A)
 		    (kill-buffer buffer-B)
 		    (kill-buffer buffer-C)