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

[Miles Bader]

Index: emacs/lisp/vc-sccs.el
diff -c emacs/lisp/vc-sccs.el:1.15.2.1 emacs/lisp/vc-sccs.el:1.15.2.2
*** emacs/lisp/vc-sccs.el:1.15.2.1      Fri Apr  4 01:20:11 2003
--- emacs/lisp/vc-sccs.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-sccs.el,v 1.15.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-sccs.el,v 1.15.2.2 2003/10/14 23:51:27 miles Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 130,144 ****
                (if (file-ownership-preserved-p file)
                    'edited
                  (vc-user-login-name owner-uid))
!           ;; Strange permissions.
!           ;; Fall through to real state computation.
!           (vc-sccs-state file)))
!     (vc-sccs-state file))))
  
  (defun vc-sccs-workfile-version (file)
    "SCCS-specific version of `vc-workfile-version'."
    (with-temp-buffer
!     (vc-insert-file (vc-name file) "^\001e")
      (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1)))
  
  (defun vc-sccs-checkout-model (file)
--- 130,148 ----
                (if (file-ownership-preserved-p file)
                    'edited
                  (vc-user-login-name owner-uid))
!             ;; Strange permissions.
!             ;; Fall through to real state computation.
!             (vc-sccs-state file))))
!     (vc-sccs-state file)))
  
  (defun vc-sccs-workfile-version (file)
    "SCCS-specific version of `vc-workfile-version'."
    (with-temp-buffer
!     ;; The workfile version is always the latest version number.
!     ;; To find this number, search the entire delta table,
!     ;; rather than just the first entry, because the
!     ;; first entry might be a deleted ("R") version.
!     (vc-insert-file (vc-name file) "^\001e\n\001[^s]")
      (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1)))
  
  (defun vc-sccs-checkout-model (file)
***************
*** 166,190 ****
  
  Automatically retrieve a read-only version of the file with keywords
  expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
!     (let* ((switches (append
!                    (if (stringp vc-register-switches)
!                        (list vc-register-switches)
!                      vc-register-switches)
!                    (if (stringp vc-sccs-register-switches)
!                        (list vc-sccs-register-switches)
!                      vc-sccs-register-switches)))
!          (dirname (or (file-name-directory file) ""))
           (basename (file-name-nondirectory file))
           (project-file (vc-sccs-search-project-dir dirname basename)))
        (let ((vc-name
             (or project-file
!                (format (car vc-sccs-master-templates) dirname basename)))|)
        (apply 'vc-do-command nil 0 "admin" vc-name
               (and rev (concat "-r" rev))
               "-fb"
               (concat "-i" (file-relative-name file))
               (and comment (concat "-y" comment))
!              switches))
        (delete-file file)
        (if vc-keep-workfiles
          (vc-do-command nil 0 "get" (vc-name file)))))
--- 170,187 ----
  
  Automatically retrieve a read-only version of the file with keywords
  expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
!     (let* ((dirname (or (file-name-directory file) ""))
           (basename (file-name-nondirectory file))
           (project-file (vc-sccs-search-project-dir dirname basename)))
        (let ((vc-name
             (or project-file
!                (format (car vc-sccs-master-templates) dirname basename))))
        (apply 'vc-do-command nil 0 "admin" vc-name
               (and rev (concat "-r" rev))
               "-fb"
               (concat "-i" (file-relative-name file))
               (and comment (concat "-y" comment))
!              (vc-switches 'SCCS 'register)))
        (delete-file file)
        (if vc-keep-workfiles
          (vc-do-command nil 0 "get" (vc-name file)))))
***************
*** 198,212 ****
  
  (defun vc-sccs-checkin (file rev comment)
    "SCCS-specific version of `vc-backend-checkin'."
!   (let ((switches (if (stringp vc-checkin-switches)
!                     (list vc-checkin-switches)
!                   vc-checkin-switches)))
!     (apply 'vc-do-command nil 0 "delta" (vc-name file)
!          (if rev (concat "-r" rev))
!          (concat "-y" comment)
!          switches)
!     (if vc-keep-workfiles
!       (vc-do-command nil 0 "get" (vc-name file)))))
  
  (defun vc-sccs-find-version (file rev buffer)
    (apply 'vc-do-command
--- 195,206 ----
  
  (defun vc-sccs-checkin (file rev comment)
    "SCCS-specific version of `vc-backend-checkin'."
!   (apply 'vc-do-command nil 0 "delta" (vc-name file)
!        (if rev (concat "-r" rev))
!        (concat "-y" comment)
!        (vc-switches 'SCCS 'checkin))
!   (if vc-keep-workfiles
!       (vc-do-command nil 0 "get" (vc-name file))))
  
  (defun vc-sccs-find-version (file rev buffer)
    (apply 'vc-do-command
***************
*** 216,224 ****
         (and rev
              (concat "-r"
                      (vc-sccs-lookup-triple file rev)))
!        (if (stringp vc-checkout-switches)
!            (list vc-checkout-switches)
!          vc-checkout-switches)))
  
  (defun vc-sccs-checkout (file &optional editable rev)
    "Retrieve a copy of a saved version of SCCS controlled FILE.
--- 210,216 ----
         (and rev
              (concat "-r"
                      (vc-sccs-lookup-triple file rev)))
!        (vc-switches 'SCCS 'checkout)))
  
  (defun vc-sccs-checkout (file &optional editable rev)
    "Retrieve a copy of a saved version of SCCS controlled FILE.
***************
*** 230,238 ****
      (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.
--- 222,228 ----
      (save-excursion
        ;; Change buffers to get local value of vc-checkout-switches.
        (if file-buffer (set-buffer file-buffer))
!       (setq switches (vc-switches 'SCCS '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.
***************
*** 298,304 ****
           (append (list "-q"
                         (and oldvers (concat "-r" oldvers))
                         (and newvers (concat "-r" newvers)))
!                  (vc-diff-switches-list 'SCCS))))
  
  
  ;;;
--- 288,294 ----
           (append (list "-q"
                         (and oldvers (concat "-r" oldvers))
                         (and newvers (concat "-r" newvers)))
!                  (vc-switches 'SCCS 'diff))))
  
  
  ;;;
***************
*** 407,410 ****
--- 397,401 ----
  
  (provide 'vc-sccs)
  
+ ;;; arch-tag: d751dee3-d7b3-47e1-95e3-7ae98c052041
  ;;; vc-sccs.el ends here