Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org

[gnu-emacs] / lisp / vc / pcvs-defs.el

diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 46b95130ca0a8dee236f98c69e4096c657dfabc4..ab45b313bd551be2b10820f4da04a982ab4f6d44 100644 (file)
--- 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-2012  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
@@ -33,7 +33,7 @@
 ;;;;       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,12 +46,12 @@
                                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.")
 
@@ -89,7 +89,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.]
@@ -243,7 +243,7 @@ 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
@@ -493,7 +493,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,7 +503,7 @@ 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)