Mercurial > emacs
comparison lisp/vc-mcvs.el @ 100171:d42aff5ca541
* align.el:
* allout.el:
* apropos.el:
* arc-mode.el:
* autoinsert.el:
* avoid.el:
* battery.el:
* bookmark.el:
* buff-menu.el:
* calculator.el:
* chistory.el:
* cmuscheme.el:
* comint.el:
* compare-w.el:
* dabbrev.el:
* delim-col.el:
* desktop.el:
* diff-mode.el:
* diff.el:
* dired-aux.el:
* dired-x.el:
* dired.el:
* dos-vars.el:
* ediff-diff.el:
* ediff-help.el:
* ediff-init.el:
* ediff-merg.el:
* ediff-mult.el:
* ediff-ptch.el:
* ediff-vers.el:
* ediff-wind.el:
* ediff.el:
* emerge.el:
* facemenu.el:
* faces.el:
* ffap.el:
* filecache.el:
* find-dired.el:
* font-core.el:
* font-lock.el:
* forms.el:
* fringe.el:
* help-at-pt.el:
* hippie-exp.el:
* ido.el:
* image-file.el:
* imenu.el:
* indent.el:
* info.el:
* isearchb.el:
* iswitchb.el:
* jit-lock.el:
* jka-compr.el:
* log-edit.el:
* lpr.el:
* ls-lisp.el:
* man.el:
* menu-bar.el:
* midnight.el:
* mouse-sel.el:
* mouse.el:
* msb.el:
* outline.el:
* paren.el:
* pcmpl-cvs.el:
* pcmpl-gnu.el:
* pcomplete.el:
* pcvs-info.el:
* pcvs-parse.el:
* printing.el:
* ps-mule.el:
* ps-print.el:
* replace.el:
* ruler-mode.el:
* saveplace.el:
* sb-image.el:
* scroll-bar.el:
* sha1.el:
* shadowfile.el:
* shell.el:
* sort.el:
* speedbar.el:
* strokes.el:
* tempo.el:
* term.el:
* terminal.el:
* time-stamp.el:
* time.el:
* tree-widget.el:
* type-break.el:
* vc-cvs.el:
* vc-hg.el:
* vc-mcvs.el:
* vc-rcs.el:
* vc-sccs.el:
* vc.el:
* view.el:
* w32-vars.el:
* whitespace.el:
* wid-edit.el: Remove leading * from docstrings of defcustoms,
deffaces, defconsts and defuns.
| author | Lute Kamstra <lute@gnu.org> |
|---|---|
| date | Wed, 03 Dec 2008 05:48:14 +0000 |
| parents | 4da572dc4992 |
| children | 951286915059 |
comparison
equal
deleted
inserted
replaced
| 100170:86455974b971 | 100171:d42aff5ca541 |
|---|---|
| 59 ;;; | 59 ;;; |
| 60 ;;; Customization options | 60 ;;; Customization options |
| 61 ;;; | 61 ;;; |
| 62 | 62 |
| 63 (defcustom vc-mcvs-global-switches nil | 63 (defcustom vc-mcvs-global-switches nil |
| 64 "*Global switches to pass to any Meta-CVS command." | 64 "Global switches to pass to any Meta-CVS command." |
| 65 :type '(choice (const :tag "None" nil) | 65 :type '(choice (const :tag "None" nil) |
| 66 (string :tag "Argument String") | 66 (string :tag "Argument String") |
| 67 (repeat :tag "Argument List" | 67 (repeat :tag "Argument List" |
| 68 :value ("") | 68 :value ("") |
| 69 string)) | 69 string)) |
| 70 :version "22.1" | 70 :version "22.1" |
| 71 :group 'vc) | 71 :group 'vc) |
| 72 | 72 |
| 73 (defcustom vc-mcvs-register-switches nil | 73 (defcustom vc-mcvs-register-switches nil |
| 74 "*Extra switches for registering a file into Meta-CVS. | 74 "Extra switches for registering a file into Meta-CVS. |
| 75 A string or list of strings passed to the checkin program by | 75 A string or list of strings passed to the checkin program by |
| 76 \\[vc-register]." | 76 \\[vc-register]." |
| 77 :type '(choice (const :tag "None" nil) | 77 :type '(choice (const :tag "None" nil) |
| 78 (string :tag "Argument String") | 78 (string :tag "Argument String") |
| 79 (repeat :tag "Argument List" | 79 (repeat :tag "Argument List" |
| 81 string)) | 81 string)) |
| 82 :version "22.1" | 82 :version "22.1" |
| 83 :group 'vc) | 83 :group 'vc) |
| 84 | 84 |
| 85 (defcustom vc-mcvs-diff-switches nil | 85 (defcustom vc-mcvs-diff-switches nil |
| 86 "*A string or list of strings specifying extra switches for cvs diff under VC." | 86 "A string or list of strings specifying extra switches for cvs diff under VC." |
| 87 :type '(choice (const :tag "None" nil) | 87 :type '(choice (const :tag "None" nil) |
| 88 (string :tag "Argument String") | 88 (string :tag "Argument String") |
| 89 (repeat :tag "Argument List" | 89 (repeat :tag "Argument List" |
| 90 :value ("") | 90 :value ("") |
| 91 string)) | 91 string)) |
| 92 :version "22.1" | 92 :version "22.1" |
| 93 :group 'vc) | 93 :group 'vc) |
| 94 | 94 |
| 95 (defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist)) | 95 (defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist)) |
| 96 vc-cvs-header) | 96 vc-cvs-header) |
| 97 "*Header keywords to be inserted by `vc-insert-headers'." | 97 "Header keywords to be inserted by `vc-insert-headers'." |
| 98 :version "22.1" | 98 :version "22.1" |
| 99 :type '(repeat string) | 99 :type '(repeat string) |
| 100 :group 'vc) | 100 :group 'vc) |
| 101 | 101 |
| 102 (defcustom vc-mcvs-use-edit vc-cvs-use-edit | 102 (defcustom vc-mcvs-use-edit vc-cvs-use-edit |
| 103 "*Non-nil means to use `cvs edit' to \"check out\" a file. | 103 "Non-nil means to use `cvs edit' to \"check out\" a file. |
| 104 This is only meaningful if you don't use the implicit checkout model | 104 This is only meaningful if you don't use the implicit checkout model |
| 105 \(i.e. if you have $CVSREAD set)." | 105 \(i.e. if you have $CVSREAD set)." |
| 106 :type 'boolean | 106 :type 'boolean |
| 107 :version "22.1" | 107 :version "22.1" |
| 108 :group 'vc) | 108 :group 'vc) |
| 408 (pop-to-buffer "*vc*") | 408 (pop-to-buffer "*vc*") |
| 409 (error "Couldn't analyze mcvs update result"))) | 409 (error "Couldn't analyze mcvs update result"))) |
| 410 (message "Merging changes into %s...done" file)))) | 410 (message "Merging changes into %s...done" file)))) |
| 411 | 411 |
| 412 (defun vc-mcvs-modify-change-comment (files rev comment) | 412 (defun vc-mcvs-modify-change-comment (files rev comment) |
| 413 "Modify the change comments for FILES on a specified REV. | 413 "Modify the change comments for FILES on a specified REV. |
| 414 Will fail unless you have administrative privileges on the repo." | 414 Will fail unless you have administrative privileges on the repo." |
| 415 (vc-mcvs-command nil 0 files "rcs" (concat "-m" comment ":" rev))) | 415 (vc-mcvs-command nil 0 files "rcs" (concat "-m" comment ":" rev))) |
| 416 | 416 |
| 417 | 417 |
| 418 ;;; | 418 ;;; |