aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc-git.el4
-rw-r--r--lisp/vc/vc-hg.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 75f458233ee..96c2f38af42 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -367,8 +367,8 @@ in the order given by 'git status'."
367 367
368(defun vc-git-file-type-as-string (old-perm new-perm) 368(defun vc-git-file-type-as-string (old-perm new-perm)
369 "Return a string describing the file type based on its permissions." 369 "Return a string describing the file type based on its permissions."
370 (let* ((old-type (lsh (or old-perm 0) -9)) 370 (let* ((old-type (ash (or old-perm 0) -9))
371 (new-type (lsh (or new-perm 0) -9)) 371 (new-type (ash (or new-perm 0) -9))
372 (str (pcase new-type 372 (str (pcase new-type
373 (?\100 ;; File. 373 (?\100 ;; File.
374 (pcase old-type 374 (pcase old-type
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 14df9d8b673..da4fc2bdf70 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -1017,7 +1017,7 @@ hg binary."
1017 ;; Dirstate too small to be valid 1017 ;; Dirstate too small to be valid
1018 (< (nth 7 dirstate-attr) 40) 1018 (< (nth 7 dirstate-attr) 40)
1019 ;; We want to store 32-bit unsigned values in fixnums. 1019 ;; We want to store 32-bit unsigned values in fixnums.
1020 (zerop (lsh -1 32)) 1020 (zerop (ash most-positive-fixnum -32))
1021 (progn 1021 (progn
1022 (setf repo-relative-filename 1022 (setf repo-relative-filename
1023 (file-relative-name truename repo)) 1023 (file-relative-name truename repo))