Mercurial > emacs

changeset 33247:23d61d30fcd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-insert-file): Don't assume byte==char.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 06 Nov 2000 13:19:38 +0000
parents d27d42483b9e
children 76c004353ceb
files lisp/vc-hooks.el
diffstat 1 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-hooks.el	Mon Nov 06 12:50:32 2000 +0000
+++ b/lisp/vc-hooks.el	Mon Nov 06 13:19:38 2000 +0000
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-hooks.el,v 1.126 2000/10/27 13:26:18 spiegel Exp $
+;; $Id: vc-hooks.el,v 1.127 2000/11/04 18:24:50 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -215,15 +215,12 @@
     (if (not limit)
         (insert-file-contents file)
       (if (not blocksize) (setq blocksize 8192))
-      (let (found s)
-        (while (not found)
-          (setq s (buffer-size))
-          (goto-char (1+ s))
-          (setq found
-                (or (zerop (cadr (insert-file-contents
-                                  file nil s (+ s blocksize))))
-                    (progn (beginning-of-line)
-                           (re-search-forward limit nil t)))))))
+      (let ((filepos 0))
+        (while
+	    (and (< 0 (cadr (insert-file-contents
+			     file nil filepos (incf filepos blocksize))))
+		 (progn (beginning-of-line)
+			(not (re-search-forward limit nil 'move)))))))
     (set-buffer-modified-p nil)
     t))