diff options
| author | Dave Love | 2000-09-07 20:09:41 +0000 |
|---|---|---|
| committer | Dave Love | 2000-09-07 20:09:41 +0000 |
| commit | a7cafade741892a98b999aa840a2eccf044e184a (patch) | |
| tree | 685d3a270d58a6a3e09053476fe47c9c5016f9a6 | |
| parent | 33c1b7a13a03ee9686cd5e8a9d18a544b29ebd6c (diff) | |
| download | emacs-a7cafade741892a98b999aa840a2eccf044e184a.tar.gz emacs-a7cafade741892a98b999aa840a2eccf044e184a.zip | |
Doc fixes.
(vc-sccs-register-switches, vc-sccs-master-templates): Add
:version.
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/vc-sccs.el | 40 |
2 files changed, 33 insertions, 20 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 57bef8264a2..f1cfe734b0a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -7,6 +7,19 @@ | |||
| 7 | 7 | ||
| 8 | 2000-09-07 Dave Love <fx@gnu.org> | 8 | 2000-09-07 Dave Love <fx@gnu.org> |
| 9 | 9 | ||
| 10 | * vc-sccs.el: Doc fixes. | ||
| 11 | (vc-sccs-register-switches, vc-sccs-master-templates): Add | ||
| 12 | :version. | ||
| 13 | |||
| 14 | * vc-rcs.el: Doc fixes. | ||
| 15 | (vc-rcs-register-switches, vc-rcs-checkin-switches) | ||
| 16 | (vc-rcs-checkout-switches, vc-rcs-header) | ||
| 17 | (vc-rcs-master-templates): Add or change :version. | ||
| 18 | |||
| 19 | * vc-cvs.el: DOc fixes. | ||
| 20 | (vc-cvs-register-switches, vc-cvs-header, vc-cvs-use-edit) | ||
| 21 | (vc-cvs-stay-local): Add :version. | ||
| 22 | |||
| 10 | * menu-bar.el (menu-bar-options-menu): Fix the font-lock toggle. | 23 | * menu-bar.el (menu-bar-options-menu): Fix the font-lock toggle. |
| 11 | 24 | ||
| 12 | 2000-09-07 Kenichi Handa <handa@etl.go.jp> | 25 | 2000-09-07 Kenichi Handa <handa@etl.go.jp> |
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el index 79936a08c6e..03bcdfd1d74 100644 --- a/lisp/vc-sccs.el +++ b/lisp/vc-sccs.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc-sccs.el,v 1.1 2000/09/04 19:48:23 gerd Exp $ | 8 | ;; $Id: vc-sccs.el,v 1.2 2000/09/05 20:08:22 monnier Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -29,14 +29,15 @@ | |||
| 29 | ;;; Code: | 29 | ;;; Code: |
| 30 | 30 | ||
| 31 | (defcustom vc-sccs-register-switches nil | 31 | (defcustom vc-sccs-register-switches nil |
| 32 | "*A string or list of strings; extra switches for registering a file | 32 | "*Extra switches for registering a file in SCCS. |
| 33 | in |SCCS. These are passed to the checkin program by | 33 | A string or list of strings passed to the checkin program by |
| 34 | \\[vc-sccs-register]." | 34 | \\[vc-sccs-register]." |
| 35 | :type '(choice (const :tag "None" nil) | 35 | :type '(choice (const :tag "None" nil) |
| 36 | (string :tag "Argument String") | 36 | (string :tag "Argument String") |
| 37 | (repeat :tag "Argument List" | 37 | (repeat :tag "Argument List" |
| 38 | :value ("") | 38 | :value ("") |
| 39 | string)) | 39 | string)) |
| 40 | :version "21.1" | ||
| 40 | :group 'vc) | 41 | :group 'vc) |
| 41 | 42 | ||
| 42 | (defcustom vc-sccs-header (or (cdr (assoc 'SCCS vc-header-alist)) '("%W%")) | 43 | (defcustom vc-sccs-header (or (cdr (assoc 'SCCS vc-header-alist)) '("%W%")) |
| @@ -54,7 +55,7 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 54 | (repeat :tag "User-specified" | 55 | (repeat :tag "User-specified" |
| 55 | (choice string | 56 | (choice string |
| 56 | function))) | 57 | function))) |
| 57 | :version "20.5" | 58 | :version "21.1" |
| 58 | :group 'vc) | 59 | :group 'vc) |
| 59 | 60 | ||
| 60 | (defconst vc-sccs-name-assoc-file "VC-names") | 61 | (defconst vc-sccs-name-assoc-file "VC-names") |
| @@ -96,7 +97,7 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 96 | (if (file-ownership-preserved-p file) | 97 | (if (file-ownership-preserved-p file) |
| 97 | 'edited | 98 | 'edited |
| 98 | (vc-user-login-name owner-uid)) | 99 | (vc-user-login-name owner-uid)) |
| 99 | ;; Strange permissions. | 100 | ;; Strange permissions. |
| 100 | ;; Fall through to real state computation. | 101 | ;; Fall through to real state computation. |
| 101 | (vc-sccs-state file))) | 102 | (vc-sccs-state file))) |
| 102 | (vc-sccs-state file)))) | 103 | (vc-sccs-state file)))) |
| @@ -107,14 +108,14 @@ For a description of possible values, see `vc-check-master-templates'." | |||
| 107 | (vc-insert-file (vc-name file) "^\001e") | 108 | (vc-insert-file (vc-name file) "^\001e") |
| 108 | (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1))) | 109 | (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1))) |
| 109 | 110 | ||
| 110 | (defun vc-sccs-checkout-model (file) | 111 | (defun vc-sccs-checkout-model (file) |
| 111 | "SCCS-specific version of `vc-checkout-model'." | 112 | "SCCS-specific version of `vc-checkout-model'." |
| 112 | 'locking) | 113 | 'locking) |
| 113 | 114 | ||
| 114 | (defun vc-sccs-workfile-unchanged-p (file) | 115 | (defun vc-sccs-workfile-unchanged-p (file) |
| 115 | "SCCS-specific implementation of vc-workfile-unchanged-p." | 116 | "SCCS-specific implementation of vc-workfile-unchanged-p." |
| 116 | (apply 'vc-do-command nil 1 "vcdiff" (vc-name file) | 117 | (apply 'vc-do-command nil 1 "vcdiff" (vc-name file) |
| 117 | (list "--brief" "-q" | 118 | (list "--brief" "-q" |
| 118 | (concat "-r" (vc-workfile-version file))))) | 119 | (concat "-r" (vc-workfile-version file))))) |
| 119 | 120 | ||
| 120 | ;; internal code | 121 | ;; internal code |
| @@ -199,7 +200,7 @@ The result is a list of the form ((VERSION . USER) (VERSION . USER) ...)." | |||
| 199 | (defun vc-sccs-lookup-triple (file name) | 200 | (defun vc-sccs-lookup-triple (file name) |
| 200 | "Return the numeric version corresponding to a named snapshot of FILE. | 201 | "Return the numeric version corresponding to a named snapshot of FILE. |
| 201 | If NAME is nil or a version number string it's just passed through." | 202 | If NAME is nil or a version number string it's just passed through." |
| 202 | (if (or (null name) | 203 | (if (or (null name) |
| 203 | (let ((firstchar (aref name 0))) | 204 | (let ((firstchar (aref name 0))) |
| 204 | (and (>= firstchar ?0) (<= firstchar ?9)))) | 205 | (and (>= firstchar ?0) (<= firstchar ?9)))) |
| 205 | name | 206 | name |
| @@ -224,10 +225,10 @@ If NAME is nil or a version number string it's just passed through." | |||
| 224 | (vc-do-command nil 0 "get" (vc-name file) "-g" (if rev (concat "-r" rev)))) | 225 | (vc-do-command nil 0 "get" (vc-name file) "-g" (if rev (concat "-r" rev)))) |
| 225 | 226 | ||
| 226 | (defun vc-sccs-cancel-version (file writable) | 227 | (defun vc-sccs-cancel-version (file writable) |
| 227 | "Undo the most recent checkin of FILE. | 228 | "Undo the most recent checkin of FILE. |
| 228 | WRITABLE non-nil means previous version should be locked." | 229 | WRITABLE non-nil means previous version should be locked." |
| 229 | (vc-do-command nil 0 "rmdel" | 230 | (vc-do-command nil 0 "rmdel" |
| 230 | (vc-name file) | 231 | (vc-name file) |
| 231 | (concat "-r" (vc-workfile-version file))) | 232 | (concat "-r" (vc-workfile-version file))) |
| 232 | (vc-do-command nil 0 "get" | 233 | (vc-do-command nil 0 "get" |
| 233 | (vc-name file) | 234 | (vc-name file) |
| @@ -255,8 +256,7 @@ WRITABLE non-nil means previous version should be locked." | |||
| 255 | (vc-do-command nil 0 "get" (vc-name file))))) | 256 | (vc-do-command nil 0 "get" (vc-name file))))) |
| 256 | 257 | ||
| 257 | (defun vc-sccs-latest-on-branch-p (file) | 258 | (defun vc-sccs-latest-on-branch-p (file) |
| 258 | "Return t iff the current workfile version of FILE is the latest on | 259 | "Return t iff the current workfile version of FILE is latest on its branch." |
| 259 | its branch." | ||
| 260 | ;; Always return t; we do not support previous versions in the workfile | 260 | ;; Always return t; we do not support previous versions in the workfile |
| 261 | ;; under SCCS. | 261 | ;; under SCCS. |
| 262 | t) | 262 | t) |
| @@ -311,7 +311,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." | |||
| 311 | (let ((vc-name | 311 | (let ((vc-name |
| 312 | (or project-file | 312 | (or project-file |
| 313 | (format (car vc-sccs-master-templates) dirname basename)))|) | 313 | (format (car vc-sccs-master-templates) dirname basename)))|) |
| 314 | (apply 'vc-do-command nil 0 "admin" nil | 314 | (apply 'vc-do-command nil 0 "admin" nil |
| 315 | (and rev (concat "-r" rev)) | 315 | (and rev (concat "-r" rev)) |
| 316 | "-fb" | 316 | "-fb" |
| 317 | (concat "-i" file) | 317 | (concat "-i" file) |
| @@ -323,9 +323,9 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." | |||
| 323 | (vc-do-command nil 0 "get" (vc-name file))))) | 323 | (vc-do-command nil 0 "get" (vc-name file))))) |
| 324 | 324 | ||
| 325 | (defun vc-sccs-checkout (file &optional writable rev workfile) | 325 | (defun vc-sccs-checkout (file &optional writable rev workfile) |
| 326 | "Retrieve a copy of a saved version of an SCCS controlled FILE into | 326 | "Retrieve a copy of a saved version of SCCS controlled FILE into a WORKFILE. |
| 327 | a WORKFILE. WRITABLE non-nil means that the file should be writable. | 327 | WRITABLE non-nil means that the file should be writable. REV is the |
| 328 | REV is the revision to check out into WORKFILE." | 328 | revision to check out into WORKFILE." |
| 329 | (let ((filename (or workfile file)) | 329 | (let ((filename (or workfile file)) |
| 330 | (file-buffer (get-file-buffer file)) | 330 | (file-buffer (get-file-buffer file)) |
| 331 | switches) | 331 | switches) |
| @@ -363,9 +363,9 @@ REV is the revision to check out into WORKFILE." | |||
| 363 | (current-buffer) 0 "get" (vc-name file) | 363 | (current-buffer) 0 "get" (vc-name file) |
| 364 | "-s" ;; suppress diagnostic output | 364 | "-s" ;; suppress diagnostic output |
| 365 | (if writable "-e") | 365 | (if writable "-e") |
| 366 | "-p" | 366 | "-p" |
| 367 | (and rev | 367 | (and rev |
| 368 | (concat "-r" | 368 | (concat "-r" |
| 369 | (vc-sccs-lookup-triple file rev))) | 369 | (vc-sccs-lookup-triple file rev))) |
| 370 | switches))) | 370 | switches))) |
| 371 | (set-file-modes filename | 371 | (set-file-modes filename |
| @@ -381,7 +381,7 @@ REV is the revision to check out into WORKFILE." | |||
| 381 | (message "Checking out %s...done" filename))) | 381 | (message "Checking out %s...done" filename))) |
| 382 | 382 | ||
| 383 | (defun vc-sccs-update-changelog (files) | 383 | (defun vc-sccs-update-changelog (files) |
| 384 | (error "Sorry, generating ChangeLog entries is not implemented for SCCS.")) | 384 | (error "Sorry, generating ChangeLog entries is not implemented for SCCS")) |
| 385 | 385 | ||
| 386 | (provide 'vc-sccs) | 386 | (provide 'vc-sccs) |
| 387 | 387 | ||