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

[Luc Teirlinck]

Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.355 emacs/lisp/vc.el:1.356
*** emacs/lisp/vc.el:1.355      Sat May 31 12:47:57 2003
--- emacs/lisp/vc.el    Fri Jun 20 09:21:24 2003
***************
*** 7,13 ****
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.355 2003/05/31 16:47:57 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 7,13 ----
  ;; Maintainer: Andre Spiegel <address@hidden>
  ;; Keywords: tools
  
! ;; $Id: vc.el,v 1.356 2003/06/20 13:21:24 teirllm Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 418,424 ****
  ;;   Rename file OLD to NEW, both in the working area and in the
  ;;   repository.  If this function is not provided, the renaming
  ;;   will be done by (vc-delete-file old) and (vc-register new).
! ;;   
  
  ;;; Code:
  
--- 418,424 ----
  ;;   Rename file OLD to NEW, both in the working area and in the
  ;;   repository.  If this function is not provided, the renaming
  ;;   will be done by (vc-delete-file old) and (vc-register new).
! ;;
  
  ;;; Code:
  
***************
*** 1747,1758 ****
  The value can also be a regular expression or list of regular
  expressions to match against the host name of a repository; then VC
  only stays local for hosts that match it.  Alternatively, the value
! can be a list of regular expressions where the first element is the 
! symbol `except'; then VC always stays local except for hosts matched 
  by these regular expressions."
    :type '(choice (const :tag "Always stay local" t)
          (const :tag "Don't stay local" nil)
!         (list :format "\nExamine hostname and %v" :tag "Examine hostname ..." 
                (set :format "%v" :inline t (const :format "%t" :tag "don't" 
except))
                (regexp :format " stay local,\n%t: %v" :tag "if it matches")
                (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
--- 1747,1758 ----
  The value can also be a regular expression or list of regular
  expressions to match against the host name of a repository; then VC
  only stays local for hosts that match it.  Alternatively, the value
! can be a list of regular expressions where the first element is the
! symbol `except'; then VC always stays local except for hosts matched
  by these regular expressions."
    :type '(choice (const :tag "Always stay local" t)
          (const :tag "Don't stay local" nil)
!         (list :format "\nExamine hostname and %v" :tag "Examine hostname ..."
                (set :format "%v" :inline t (const :format "%t" :tag "don't" 
except))
                (regexp :format " stay local,\n%t: %v" :tag "if it matches")
                (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
***************
*** 2671,2677 ****
    (let ((buf (get-file-buffer file))
          (backend (vc-backend file)))
      (unless backend
!       (error "File %s is not under version control" 
               (file-name-nondirectory file)))
      (unless (vc-find-backend-function backend 'delete-file)
        (error "Deleting files under %s is not supported in VC" backend))
--- 2671,2677 ----
    (let ((buf (get-file-buffer file))
          (backend (vc-backend file)))
      (unless backend
!       (error "File %s is not under version control"
               (file-name-nondirectory file)))
      (unless (vc-find-backend-function backend 'delete-file)
        (error "Deleting files under %s is not supported in VC" backend))
***************
*** 2707,2713 ****
        (error "Already editing new file name"))
      (if (file-exists-p new)
        (error "New file already exists"))
!     (let ((state (vc-state file)))
        (unless (memq state '(up-to-date edited))
        (error "Please %s files before moving them"
               (if (stringp state) "check in" "update"))))
--- 2707,2713 ----
        (error "Already editing new file name"))
      (if (file-exists-p new)
        (error "New file already exists"))
!     (let ((state (vc-state old)))
        (unless (memq state '(up-to-date edited))
        (error "Please %s files before moving them"
               (if (stringp state) "check in" "update"))))