aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2018-08-22 14:11:25 -0700
committerPaul Eggert2018-08-22 14:14:21 -0700
commitbe5fe6183e95f3afe3a62ec43504b99df90bc794 (patch)
treed06885f6064bb22038dee94d9a1b31eb19d86730
parentae38a3b8208a71c32f723776297290ee5096d8d4 (diff)
downloademacs-be5fe6183e95f3afe3a62ec43504b99df90bc794.tar.gz
emacs-be5fe6183e95f3afe3a62ec43504b99df90bc794.zip
Undo part of previous change
Issue spotted by Pip Cet in: https://lists.gnu.org/r/emacs-devel/2018-08/msg00758.html * lisp/vc/vc-hg.el (vc-hg--raw-dirstate-search): Go back to using eq on flen, since it must be a fixnum.
-rw-r--r--lisp/vc/vc-hg.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index d11dc4c5f41..76eec884a17 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -629,7 +629,7 @@ Return the byte's value as an integer."
629 ;; 1+4*4 is the length of the dirstate item header. 629 ;; 1+4*4 is the length of the dirstate item header.
630 (forward-char (1+ (* 3 4))) 630 (forward-char (1+ (* 3 4)))
631 (let ((this-flen (vc-hg--read-u32-be))) 631 (let ((this-flen (vc-hg--read-u32-be)))
632 (if (and (or (eql this-flen flen) 632 (if (and (or (eq this-flen flen)
633 (and (> this-flen flen) 633 (and (> this-flen flen)
634 (eq (char-after (+ (point) flen)) 0))) 634 (eq (char-after (+ (point) flen)) 0)))
635 (search-forward fname (+ (point) flen) t)) 635 (search-forward fname (+ (point) flen) t))