[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el

[Andre Spiegel]

Index: emacs/lisp/vc-hooks.el
diff -c emacs/lisp/vc-hooks.el:1.140 emacs/lisp/vc-hooks.el:1.141
*** emacs/lisp/vc-hooks.el:1.140        Tue Jul 16 13:42:57 2002
--- emacs/lisp/vc-hooks.el      Fri Jul 19 09:26:11 2002
***************
*** 5,11 ****
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.140 2002/07/16 17:42:57 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.141 2002/07/19 13:26:11 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 216,223 ****
  
  Optional argument LIMIT is a regexp.  If present, the file is inserted
  in chunks of size BLOCKSIZE (default 8 kByte), until the first
! occurrence of LIMIT is found.  The function returns non-nil if FILE 
! exists and its contents were successfully inserted."
    (erase-buffer)
    (when (file-exists-p file)
      (if (not limit)
--- 216,224 ----
  
  Optional argument LIMIT is a regexp.  If present, the file is inserted
  in chunks of size BLOCKSIZE (default 8 kByte), until the first
! occurrence of LIMIT is found.  Anything from the start of that occurence
! to the end of the buffer is then deleted.  The function returns
! non-nil if FILE exists and its contents were successfully inserted."
    (erase-buffer)
    (when (file-exists-p file)
      (if (not limit)
***************
*** 228,234 ****
            (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))
  
--- 229,238 ----
            (and (< 0 (cadr (insert-file-contents
                             file nil filepos (incf filepos blocksize))))
                 (progn (beginning-of-line)
!                         (let ((pos (re-search-forward limit nil 'move)))
!                           (if pos (delete-region (match-beginning 0)
!                                                  (point-max)))
!                           (not pos)))))))
      (set-buffer-modified-p nil)
      t))