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

[Miles Bader]

Index: emacs/lisp/vc-rcs.el
diff -c emacs/lisp/vc-rcs.el:1.24.2.1 emacs/lisp/vc-rcs.el:1.24.2.2
*** emacs/lisp/vc-rcs.el:1.24.2.1       Fri Apr  4 01:20:11 2003
--- emacs/lisp/vc-rcs.el        Tue Oct 14 19:51:27 2003
***************
*** 5,11 ****
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <address@hidden>
  
! ;; $Id: vc-rcs.el,v 1.24.2.1 2003/04/04 06:20:11 miles 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-rcs.el,v 1.24.2.2 2003/10/14 23:51:27 miles Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 235,249 ****
  
  Automatically retrieve a read-only version of the file with keywords
  expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
!     (let ((subdir (expand-file-name "RCS" (file-name-directory file)))
!         (switches (append
!                    (if (stringp vc-register-switches)
!                        (list vc-register-switches)
!                      vc-register-switches)
!                    (if (stringp vc-rcs-register-switches)
!                    (list vc-rcs-register-switches)
!                    vc-rcs-register-switches))))
! 
        (and (not (file-exists-p subdir))
           (not (directory-files (file-name-directory file)
                                 nil ".*,v$" t))
--- 235,241 ----
  
  Automatically retrieve a read-only version of the file with keywords
  expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
!     (let ((subdir (expand-file-name "RCS" (file-name-directory file))))
        (and (not (file-exists-p subdir))
           (not (directory-files (file-name-directory file)
                                 nil ".*,v$" t))
***************
*** 254,260 ****
             (and (vc-rcs-release-p "5.6.4") "-i")
             (concat (if vc-keep-workfiles "-u" "-r") rev)
             (and comment (concat "-t-" comment))
!            switches)
        ;; parse output to find master file name and workfile version
        (with-current-buffer "*vc*"
          (goto-char (point-min))
--- 246,252 ----
             (and (vc-rcs-release-p "5.6.4") "-i")
             (concat (if vc-keep-workfiles "-u" "-r") rev)
             (and comment (concat "-t-" comment))
!            (vc-switches 'RCS 'register))
        ;; parse output to find master file name and workfile version
        (with-current-buffer "*vc*"
          (goto-char (point-min))
***************
*** 312,320 ****
  
  (defun vc-rcs-checkin (file rev comment)
    "RCS-specific version of `vc-backend-checkin'."
!   (let ((switches (if (stringp vc-checkin-switches)
!                     (list vc-checkin-switches)
!                   vc-checkin-switches)))
      (let ((old-version (vc-workfile-version file)) new-version
          (default-branch (vc-file-getprop file 'vc-rcs-default-branch)))
        ;; Force branch creation if an appropriate
--- 304,310 ----
  
  (defun vc-rcs-checkin (file rev comment)
    "RCS-specific version of `vc-backend-checkin'."
!   (let ((switches (vc-switches 'RCS 'checkin)))
      (let ((old-version (vc-workfile-version file)) new-version
          (default-branch (vc-file-getprop file 'vc-rcs-default-branch)))
        ;; Force branch creation if an appropriate
***************
*** 367,375 ****
         buffer 0 "co" (vc-name file)
         "-q" ;; suppress diagnostic output
         (concat "-p" rev)
!        (if (stringp vc-checkout-switches)
!            (list vc-checkout-switches)
!          vc-checkout-switches)))
  
  (defun vc-rcs-checkout (file &optional editable rev)
    "Retrieve a copy of a saved version of FILE."
--- 357,363 ----
         buffer 0 "co" (vc-name file)
         "-q" ;; suppress diagnostic output
         (concat "-p" rev)
!        (vc-switches 'RCS 'checkout)))
  
  (defun vc-rcs-checkout (file &optional editable rev)
    "Retrieve a copy of a saved version of FILE."
***************
*** 379,387 ****
      (save-excursion
        ;; Change buffers to get local value of vc-checkout-switches.
        (if file-buffer (set-buffer file-buffer))
!       (setq switches (if (stringp vc-checkout-switches)
!                        (list vc-checkout-switches)
!                      vc-checkout-switches))
        ;; Save this buffer's default-directory
        ;; and use save-excursion to make sure it is restored
        ;; in the same buffer it was saved in.
--- 367,373 ----
      (save-excursion
        ;; Change buffers to get local value of vc-checkout-switches.
        (if file-buffer (set-buffer file-buffer))
!       (setq switches (vc-switches 'RCS 'checkout))
        ;; Save this buffer's default-directory
        ;; and use save-excursion to make sure it is restored
        ;; in the same buffer it was saved in.
***************
*** 428,434 ****
            (vc-file-setprop file 'vc-workfile-version new-version)
            ;; if necessary, adjust the default branch
            (and rev (not (string= rev ""))
!                (vc-rcs-set-default-branch
                  file
                  (if (vc-rcs-latest-on-branch-p file new-version)
                      (if (vc-trunk-p new-version) nil
--- 414,420 ----
            (vc-file-setprop file 'vc-workfile-version new-version)
            ;; if necessary, adjust the default branch
            (and rev (not (string= rev ""))
!                (vc-rcs-set-default-branch 
                  file
                  (if (vc-rcs-latest-on-branch-p file new-version)
                      (if (vc-trunk-p new-version) nil
***************
*** 504,510 ****
           (append (list "-q"
                         (concat "-r" oldvers)
                         (and newvers (concat "-r" newvers)))
!                  (vc-diff-switches-list 'RCS))))
  
  
  ;;;
--- 490,496 ----
           (append (list "-q"
                         (concat "-r" oldvers)
                         (and newvers (concat "-r" newvers)))
!                  (vc-switches 'RCS 'diff))))
  
  
  ;;;
***************
*** 796,799 ****
--- 782,786 ----
  
  (provide 'vc-rcs)
  
+ ;;; arch-tag: 759b4916-5b0d-431d-b647-b185b8c652cf
  ;;; vc-rcs.el ends here