[Emacs-diffs] Changes to emacs/lisp/pcvs-util.el

[Stefan Monnier]

Index: emacs/lisp/pcvs-util.el
diff -c emacs/lisp/pcvs-util.el:1.15 emacs/lisp/pcvs-util.el:1.16
*** emacs/lisp/pcvs-util.el:1.15        Fri Nov 16 19:48:14 2001
--- emacs/lisp/pcvs-util.el     Sun Dec  2 02:41:47 2001
***************
*** 5,11 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-util.el,v 1.15 2001/11/17 00:48:14 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-util.el,v 1.16 2001/12/02 07:41:47 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 185,202 ****
  If ONELINE is t, only the first line (no \\n) will be returned.
  If ARGS is non-nil, the file will be executed with ARGS as its
  arguments.  If ARGS is not a list, no argument will be passed."
!   (with-temp-buffer
!     (condition-case nil
!       (progn
!         (if args
!             (apply 'call-process
!                    file nil t nil (when (listp args) args))
!           (insert-file-contents file))
!         (buffer-substring (point-min)
!                           (if oneline
!                               (progn (goto-char (point-min)) (end-of-line) 
(point))
!                             (point-max))))
!       (file-error nil))))
  
  (defun cvs-string-prefix-p (str1 str2)
    "Tell whether STR1 is a prefix of STR2."
--- 185,200 ----
  If ONELINE is t, only the first line (no \\n) will be returned.
  If ARGS is non-nil, the file will be executed with ARGS as its
  arguments.  If ARGS is not a list, no argument will be passed."
!   (condition-case nil
!       (with-temp-buffer
!       (if args
!           (apply 'call-process
!                  file nil t nil (when (listp args) args))
!         (insert-file-contents file))
!       (goto-char (point-min))
!       (buffer-substring (point)
!                         (if oneline (line-end-position) (point-max))))
!     (file-error nil)))
  
  (defun cvs-string-prefix-p (str1 str2)
    "Tell whether STR1 is a prefix of STR2."
***************
*** 230,236 ****
        (append (unless (eq i 0) (split-string (substring string 0 i) sep))
              (let ((rfs (read-from-string string i)))
                (cons (car rfs)
!                     (cvs-string->strings (substring string (cdr rfs)) 
sep)))))))
  
  ;;;; 
  ;;;; file names
--- 228,235 ----
        (append (unless (eq i 0) (split-string (substring string 0 i) sep))
              (let ((rfs (read-from-string string i)))
                (cons (car rfs)
!                     (cvs-string->strings (substring string (cdr rfs))
!                                          sep)))))))
  
  ;;;; 
  ;;;; file names