diff options
Diffstat (limited to 'lisp/vc/vc-sccs.el')
| -rw-r--r-- | lisp/vc/vc-sccs.el | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 3d3f4048052..92cce5f13a8 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -55,8 +55,7 @@ If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" - :group 'vc-sccs) + :version "21.1") (defcustom vc-sccs-diff-switches nil "String or list of strings specifying switches for SCCS diff under VC. @@ -65,14 +64,12 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" - :group 'vc-sccs) + :version "21.1") (defcustom vc-sccs-header '("%W%") "Header keywords to be inserted by `vc-insert-headers'." :type '(repeat string) - :version "24.1" ; no longer consult the obsolete vc-header-alist - :group 'vc-sccs) + :version "24.1") ; no longer consult the obsolete vc-header-alist ;; This needs to be autoloaded because vc-sccs-registered uses it (via ;; vc-default-registered), and vc-hooks needs to be able to check @@ -87,8 +84,7 @@ For a description of possible values, see `vc-check-master-templates'." (repeat :tag "User-specified" (choice string function))) - :version "21.1" - :group 'vc-sccs) + :version "21.1") ;;; @@ -163,7 +159,7 @@ For a description of possible values, see `vc-check-master-templates'." "Write the SCCS version of input file FILE to output file OUTFILE. Optional string REV is a revision." (with-temp-buffer - (apply 'vc-sccs-do-command t 0 "get" (vc-master-name file) + (apply #'vc-sccs-do-command t 0 "get" (vc-master-name file) (append '("-s" "-p" "-k") ; -k: no keyword expansion (if rev (list (concat "-r" rev))))) (write-region nil nil outfile nil 'silent))) @@ -185,7 +181,7 @@ Optional string REV is a revision." (defun vc-sccs-do-command (buffer okstatus command file-or-list &rest flags) ;; (let ((load-path (append vc-sccs-path load-path))) ;; (apply 'vc-do-command buffer okstatus command file-or-list flags)) - (apply 'vc-do-command (or buffer "*vc*") okstatus "sccs" file-or-list command flags)) + (apply #'vc-do-command (or buffer "*vc*") okstatus "sccs" file-or-list command flags)) (defun vc-sccs-create-repo () "Create a new SCCS repository." @@ -207,7 +203,7 @@ to the SCCS command." (let ((vc-master-name (or project-file (format (car vc-sccs-master-templates) dirname basename)))) - (apply 'vc-sccs-do-command nil 0 "admin" vc-master-name + (apply #'vc-sccs-do-command nil 0 "admin" vc-master-name "-fb" (concat "-i" (file-relative-name file)) (and comment (concat "-y" comment)) @@ -225,14 +221,14 @@ to the SCCS command." (defun vc-sccs-checkin (files comment &optional rev) "SCCS-specific version of `vc-backend-checkin'." (dolist (file (vc-expand-dirs files 'SCCS)) - (apply 'vc-sccs-do-command nil 0 "delta" (vc-master-name file) + (apply #'vc-sccs-do-command nil 0 "delta" (vc-master-name file) (if rev (concat "-r" rev)) (concat "-y" comment) (vc-switches 'SCCS 'checkin)) (vc-sccs-do-command nil 0 "get" (vc-master-name file)))) (defun vc-sccs-find-revision (file rev buffer) - (apply 'vc-sccs-do-command + (apply #'vc-sccs-do-command buffer 0 "get" (vc-master-name file) "-s" ;; suppress diagnostic output "-p" @@ -247,7 +243,7 @@ If FILE is a directory, all version-controlled files beneath are checked out. EDITABLE non-nil means that the file should be writable and locked. REV is the revision to check out." (if (file-directory-p file) - (mapc 'vc-sccs-checkout (vc-expand-dirs (list file) 'SCCS)) + (mapc #'vc-sccs-checkout (vc-expand-dirs (list file) 'SCCS)) (let ((file-buffer (get-file-buffer file)) switches) (message "Checking out %s..." file) @@ -267,7 +263,7 @@ locked. REV is the revision to check out." (and rev (or (string= rev "") (not (stringp rev))) (setq rev nil)) - (apply 'vc-sccs-do-command nil 0 "get" (vc-master-name file) + (apply #'vc-sccs-do-command nil 0 "get" (vc-master-name file) "-e" (and rev (concat "-r" (vc-sccs-lookup-triple file rev))) switches)))) @@ -277,7 +273,7 @@ locked. REV is the revision to check out." "Revert FILE to the version it was based on. If FILE is a directory, revert all subfiles." (if (file-directory-p file) - (mapc 'vc-sccs-revert (vc-expand-dirs (list file) 'SCCS)) + (mapc #'vc-sccs-revert (vc-expand-dirs (list file) 'SCCS)) (vc-sccs-do-command nil 0 "unget" (vc-master-name file)) (vc-sccs-do-command nil 0 "get" (vc-master-name file)) ;; Checking out explicit revisions is not supported under SCCS, yet. @@ -288,7 +284,7 @@ revert all subfiles." (defun vc-sccs-steal-lock (file &optional rev) "Steal the lock on the current workfile for FILE and revision REV." (if (file-directory-p file) - (mapc 'vc-sccs-steal-lock (vc-expand-dirs (list file) 'SCCS)) + (mapc #'vc-sccs-steal-lock (vc-expand-dirs (list file) 'SCCS)) (vc-sccs-do-command nil 0 "unget" (vc-master-name file) "-n" (if rev (concat "-r" rev))) (vc-sccs-do-command nil 0 "get" @@ -309,7 +305,7 @@ revert all subfiles." "Print commit log associated with FILES into specified BUFFER. Remaining arguments are ignored." (setq files (vc-expand-dirs files 'SCCS)) - (vc-sccs-do-command buffer 0 "prs" (mapcar 'vc-master-name files)) + (vc-sccs-do-command buffer 0 "prs" (mapcar #'vc-master-name files)) (when limit 'limit-unsupported)) (autoload 'vc-setup-buffer "vc-dispatcher") @@ -338,7 +334,7 @@ Remaining arguments are ignored." (fake-command (format "diff%s %s" (if fake-flags - (concat " " (mapconcat 'identity fake-flags " ")) + (concat " " (mapconcat #'identity fake-flags " ")) "") (vc-delistify files))) (status 0) @@ -362,7 +358,7 @@ Remaining arguments are ignored." (cons "LC_MESSAGES=C" process-environment)) (w32-quote-process-args t) (this-status - (apply 'process-file "diff" nil t nil + (apply #'process-file "diff" nil t nil (append (vc-switches 'SCCS 'diff) (list (file-local-name oldfile) (or newfile |