Mercurial > emacs
comparison lisp/obsolete/vc-mcvs.el @ 111233:d86e0c3de741
merge trunk
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Thu, 14 Oct 2010 16:21:40 +0900 |
parents | d90a3bc6b730 |
children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
109848:637005c4c3ca | 111233:d86e0c3de741 |
---|---|
100 (string :tag "Argument String") | 100 (string :tag "Argument String") |
101 (repeat :tag "Argument List" :value ("") string)) | 101 (repeat :tag "Argument List" :value ("") string)) |
102 :version "22.1" | 102 :version "22.1" |
103 :group 'vc) | 103 :group 'vc) |
104 | 104 |
105 (defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist)) | 105 (defcustom vc-mcvs-header vc-cvs-header |
106 vc-cvs-header) | |
107 "Header keywords to be inserted by `vc-insert-headers'." | 106 "Header keywords to be inserted by `vc-insert-headers'." |
108 :version "22.1" | 107 :version "24.1" ; no longer consult the obsolete vc-header-alist |
109 :type '(repeat string) | 108 :type '(repeat string) |
110 :group 'vc) | 109 :group 'vc) |
111 | 110 |
112 (defcustom vc-mcvs-use-edit vc-cvs-use-edit | 111 (defcustom vc-mcvs-use-edit vc-cvs-use-edit |
113 "Non-nil means to use `cvs edit' to \"check out\" a file. | 112 "Non-nil means to use `cvs edit' to \"check out\" a file. |