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

[Juanma Barranquero]

Index: emacs/lisp/vc-hooks.el
diff -c emacs/lisp/vc-hooks.el:1.145 emacs/lisp/vc-hooks.el:1.146
*** emacs/lisp/vc-hooks.el:1.145        Thu Sep  5 02:31:11 2002
--- emacs/lisp/vc-hooks.el      Thu Oct 17 11:46:06 2002
***************
*** 5,11 ****
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-hooks.el,v 1.145 2002/09/05 06:31:11 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.146 2002/10/17 15:46:06 lektu Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 170,176 ****
  
  (defun vc-find-backend-function (backend fun)
    "Return BACKEND-specific implementation of FUN.
! If there is no such implementation, return the default implementation; 
  if that doesn't exist either, return nil."
    (let ((f (vc-make-backend-sym backend fun)))
      (if (fboundp f) f
--- 170,176 ----
  
  (defun vc-find-backend-function (backend fun)
    "Return BACKEND-specific implementation of FUN.
! If there is no such implementation, return the default implementation;
  if that doesn't exist either, return nil."
    (let ((f (vc-make-backend-sym backend fun)))
      (if (fboundp f) f
***************
*** 217,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.  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)
--- 217,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.  Anything from the start of that occurrence
  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)
***************
*** 268,274 ****
             (and (vc-call-backend b 'registered file)
                  (vc-file-setprop file 'vc-backend b)
                  (throw 'found t)))
!          (if (or (not backend) (eq backend 'none)) 
               vc-handled-backends
             (cons backend vc-handled-backends))))
          ;; File is not registered.
--- 268,274 ----
             (and (vc-call-backend b 'registered file)
                  (vc-file-setprop file 'vc-backend b)
                  (throw 'found t)))
!          (if (or (not backend) (eq backend 'none))
               vc-handled-backends
             (cons backend vc-handled-backends))))
          ;; File is not registered.
***************
*** 351,357 ****
  
    USER               The current version of the working file is locked by
                       some other USER (a string).
!             
    'needs-patch       The file has not been edited by the user, but there is
                       a more recent version on the current branch stored
                       in the master file.
--- 351,357 ----
  
    USER               The current version of the working file is locked by
                       some other USER (a string).
! 
    'needs-patch       The file has not been edited by the user, but there is
                       a more recent version on the current branch stored
                       in the master file.
***************
*** 501,508 ****
    (if regexp
        (concat (regexp-quote (file-name-nondirectory file))
                "\\.~[0-9.]+" (unless manual "\\.") "~")
!     (expand-file-name (concat (file-name-nondirectory file) 
!                               ".~" (or rev (vc-workfile-version file)) 
                                (unless manual ".") "~")
                        (file-name-directory file))))
  
--- 501,508 ----
    (if regexp
        (concat (regexp-quote (file-name-nondirectory file))
                "\\.~[0-9.]+" (unless manual "\\.") "~")
!     (expand-file-name (concat (file-name-nondirectory file)
!                               ".~" (or rev (vc-workfile-version file))
                                (unless manual ".") "~")
                        (file-name-directory file))))
  
***************
*** 658,664 ****
                       (get-file-buffer
                        (abbreviate-file-name
                           (file-chase-links buffer-file-name))))
!                      
                   (vc-follow-link)
                   (message "Followed link to %s" buffer-file-name)
                   (vc-find-file-hook))
--- 658,664 ----
                       (get-file-buffer
                        (abbreviate-file-name
                           (file-chase-links buffer-file-name))))
! 
                   (vc-follow-link)
                   (message "Followed link to %s" buffer-file-name)
                   (vc-find-file-hook))