X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5ed99d3685cc8d13f8e4c63ad449a6e4d63c8eb0..f0db3488160698cb48206d53742f938b71d1aeeb:/lisp/vc/pcvs-defs.el diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 46b95130ca..b89c4df581 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el @@ -1,6 +1,6 @@ ;;; pcvs-defs.el --- variable definitions for PCL-CVS -;; Copyright (C) 1991-2011 Free Software Foundation, Inc. +;; Copyright (C) 1991-2014 Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: pcl-cvs @@ -26,14 +26,13 @@ ;;; Code: -(eval-when-compile (require 'cl)) (require 'pcvs-util) ;;;; ------------------------------------------------------- ;;;; START OF THINGS TO CHECK WHEN INSTALLING (defvar cvs-program "cvs" - "*Name or full path of the cvs executable.") + "Name or full path of the cvs executable.") (defvar cvs-version ;; With the divergence of the CVSNT codebase and version numbers, this is @@ -46,23 +45,19 @@ nil t) (cons (string-to-number (match-string 1)) (string-to-number (match-string 2)))))) - "*Version of `cvs' installed on your system. + "Version of `cvs' installed on your system. It must be in the (MAJOR . MINOR) format.") ;; FIXME: this is only used by cvs-mode-diff-backup (defvar cvs-diff-program (or (and (boundp 'diff-command) diff-command) "diff") - "*Name or full path of the best diff program you've got. + "Name or full path of the best diff program you've got. NOTE: there are some nasty bugs in the context diff variants of some vendor versions, such as the one in SunOS-4.") ;;;; END OF THINGS TO CHECK WHEN INSTALLING ;;;; -------------------------------------------------------- -;;;; ;;;; User configuration variables: -;;;; -;;;; NOTE: these should be set in your ~/.emacs (or site-lisp/default.el) file. -;;;; (defgroup pcl-cvs nil "Special support for the CVS versioning system." @@ -89,7 +84,7 @@ will select a shared-flag.") "List of flags whose settings is shared among several commands.") (defvar cvs-cvsroot nil - "*Specifies where the (current) cvs master repository is. + "Specifies where the (current) cvs master repository is. Overrides the environment variable $CVSROOT by sending \" -d dir\" to all CVS commands. This switch is useful if you have multiple CVS repositories. It can be set interactively with \\[cvs-change-cvsroot.] @@ -97,17 +92,17 @@ There is no need to set this if $CVSROOT is set to a correct value.") (defcustom cvs-auto-remove-handled nil "If up-to-date files should be acknowledged automatically. -If T, they will be removed from the *cvs* buffer after every command. -If DELAYED, they will be removed from the *cvs* buffer before every command. -If STATUS, they will only be removed after a `cvs-mode-status' command. +If t, they will be removed from the *cvs* buffer after every command. +If `delayed', they will be removed from the *cvs* buffer before every command. +If `status', they will only be removed after a `cvs-mode-status' command. Else, they will never be automatically removed from the *cvs* buffer." :group 'pcl-cvs :type '(choice (const nil) (const status) (const delayed) (const t))) (defcustom cvs-auto-remove-directories 'handled - "If ALL, directory entries will never be shown. -If HANDLED, only non-handled directories will be shown. -If EMPTY, only non-empty directories will be shown." + "If `all', directory entries will never be shown. +If `handled', only non-handled directories will be shown. +If `empty', only non-empty directories will be shown." :group 'pcl-cvs :type '(choice (const :tag "No" nil) (const all) (const handled) (const empty))) @@ -134,18 +129,13 @@ useful to be able to tag a single file. The normal way to do that is to use Normally they run on the files that are marked (with `cvs-mode-mark'), or the file under the cursor if no files are marked. If this variable is set to a non-nil value they will by default run on the file on the -current line. See also `cvs-invert-ignore-marks'" +current line. See also `cvs-invert-ignore-marks'." :group 'pcl-cvs :type '(boolean)) -(defvar cvs-diff-ignore-marks t) -(make-obsolete-variable 'cvs-diff-ignore-marks - 'cvs-invert-ignore-marks - "21.1") - (defcustom cvs-invert-ignore-marks (let ((l ())) - (unless (equal cvs-diff-ignore-marks cvs-default-ignore-marks) + (unless (equal cvs-default-ignore-marks t) (push "diff" l)) (when (and cvs-force-dir-tag (not cvs-default-ignore-marks)) (push "tag" l)) @@ -176,11 +166,6 @@ If set to nil, `cvs-mode-add' will always prompt for a message." :type '(choice (const :tag "Prompt" nil) (string))) -(defvar cvs-diff-buffer-name "*cvs-diff*") -(make-obsolete-variable 'cvs-diff-buffer-name - 'cvs-buffer-name-alist - "21.1") - (defcustom cvs-find-file-and-jump nil "Jump to the modified area when finding a file. If non-nil, `cvs-mode-find-file' will place the cursor at the beginning of @@ -190,7 +175,7 @@ have no effect." :type '(boolean)) (defcustom cvs-buffer-name-alist - '(("diff" cvs-diff-buffer-name diff-mode) + '(("diff" "*cvs-diff*" diff-mode) ("status" "*cvs-info*" cvs-status-mode) ("tree" "*cvs-info*" cvs-status-mode) ("message" "*cvs-commit*" nil log-edit) @@ -243,14 +228,14 @@ the directory name of the cvs buffer.") ;; Was '(expand-file-name " *cvs-tmp*" dir), but that causes them to ;; become non-hidden if uniquification is done `forward'. " *cvs-tmp*" - "*Name of the cvs temporary buffer. + "Name of the cvs temporary buffer. Output from cvs is placed here for asynchronous commands.") (defcustom cvs-idiff-imerge-handlers (if (fboundp 'ediff) '(cvs-ediff-diff . cvs-ediff-merge) '(cvs-emerge-diff . cvs-emerge-merge)) - "Pair of functions to be used for resp. diff'ing and merg'ing interactively." + "Pair of functions to be used for resp. diff'ing and merg'ing interactively." :group 'pcl-cvs :type '(choice (const :tag "Ediff" (cvs-ediff-diff . cvs-ediff-merge)) (const :tag "Emerge" (cvs-emerge-diff . cvs-emerge-merge)))) @@ -259,13 +244,6 @@ Output from cvs is placed here for asynchronous commands.") "Run after `cvs-mode' was setup.") -;;;; -;;;; Internal variables, used in the process buffer. -;;;; - -(defvar cvs-postprocess nil - "(Buffer local) what to do once the process exits.") - ;;;; ;;;; Internal variables for the *cvs* buffer. ;;;; @@ -273,10 +251,10 @@ Output from cvs is placed here for asynchronous commands.") (defcustom cvs-reuse-cvs-buffer 'subdir "When to reuse an existing cvs buffer. Alternatives are: - CURRENT: just reuse the current buffer if it is a cvs buffer - SAMEDIR: reuse any cvs buffer displaying the same directory - SUBDIR: or reuse any cvs buffer displaying any sub- or super- directory - ALWAYS: reuse any cvs buffer." + `current': just reuse the current buffer if it is a cvs buffer + `samedir': reuse any cvs buffer displaying the same directory + `subdir': or reuse any cvs buffer displaying any sub- or super- directory + `always': reuse any cvs buffer." :group 'pcl-cvs :type '(choice (const always) (const subdir) (const samedir) (const current))) @@ -446,6 +424,7 @@ This variable is buffer local and only used in the *cvs* buffer.") (defcustom cvs-minor-mode-prefix "\C-xc" "Prefix key for the `cvs-mode' bindings in `cvs-minor-mode'." + :type 'string :group 'pcl-cvs) (easy-mmode-defmap cvs-minor-mode-map @@ -493,7 +472,8 @@ It is expected to call the function.") (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) - (fset 'cvs-global-menu m))) + (fset 'cvs-global-menu m)) + "Global menu used by PCL-CVS.") ;; cvs-1.10 and above can take file arguments in other directories @@ -502,22 +482,22 @@ It is expected to call the function.") (if (or (null cvs-version) (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1))) ;; Supposedly some recent versions of CVS output some directory info - ;; as they recurse downthe tree, but it's not good enough in the case + ;; as they recurse down the tree, but it's not good enough in the case ;; where we run "cvs status foo bar/foo". '("status") t) "Whether cvs commands should be executed a directory at a time. If a list, specifies for which commands the single-dir mode should be used. -If T, single-dir mode should be used for all operations. +If t, single-dir mode should be used for all operations. CVS versions before 1.10 did not allow passing them arguments in different -directories, so pcl-cvs checks what version you're using to determine +directories, so PCL-CVS checks what version you're using to determine whether to use the new feature or not. Sadly, even with a new cvs executable, if you connect to an older cvs server \(typically a cvs-1.9 on the server), the old restriction applies. In such -a case the sanity check made by pcl-cvs fails and you will have to manually +a case the sanity check made by PCL-CVS fails and you will have to manually set this variable to t (until the cvs server is upgraded). -When the above problem occurs, pcl-cvs should (hopefully) catch cvs' error +When the above problem occurs, PCL-CVS should (hopefully) catch cvs' error message and replace it with a message telling you to change this variable.") ;;