p4-lowlevel.el

@@ -352,7 +352,8 @@ that buffer. Returns the buffer."
 (defun p4-lowlevel-command-messages ()
   "Return t if ‘vc-command-messages’ bound and true.
 Fall back to the value of ‘p4-lowlevel-command-messages’."
-  (or (bound-and-true-p vc-command-messages)
+  (if (and (boundp 'vc-command-messages) vc-command-messages)
+      t
     p4-lowlevel-command-messages))
 
 (defun p4-lowlevel-canonicalize-revision (rev)
@@ -626,7 +627,7 @@ then the `-q' flag is passed to `p4 print'."
   (let* ((fullfile (if rev (concat file rev) file))
          (quiet-args (if quiet (list "-q")))
          (args (append (list "print") quiet-args (list fullfile))))
-    (p4-lowlevel-command-into-buffer args output-format)))
+    (p4-lowlevel-command-or-error args nil output-format)))
 
 ;; Here's what we need to support from the "p4 reopen" command, at least for the
 ;; time being:

vc-p4.el

@@ -930,7 +930,7 @@ If DIRNAME is not specified, uses `default-directory'."
          (info (p4-lowlevel-info))
          (root (alist-get "Client root" info nil nil #'string=))
          (cwd (alist-get "Current directory" info nil nil #'string=)))
-    (string-prefix-p root cwd t)))
+    (string-prefix-p root cwd)))
 
 (defun vc-p4-has-unresolved-conflicts-p (file)
   "Search through FILE's buffer for unresolved P4 conflicts.