Add a provide statement.

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

diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index eaf8d5f78a05e3437f6952bd128112a234a3e59f..6bdd6bb6dd8ad1c78bc97c38c816b1e5fb07f5b2 100644 (file)
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -1,10 +1,10 @@
 ;;; pcvs-defs.el --- variable definitions for PCL-CVS
 
-;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000  Free Software Foundation, Inc.
+;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+;;   2000, 2003, 2004  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-defs.el,v 1.16 2001/10/31 17:39:07 sds Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -40,7 +40,7 @@
 (defvar cvs-version
   (ignore-errors
     (with-temp-buffer
-      (call-process "cvs" nil t nil "-v")
+      (call-process cvs-program nil t nil "-v")
       (goto-char (point-min))
       (when (re-search-forward "(CVS) \\([0-9]+\\)\\.\\([0-9]+\\)" nil t)
        (cons (string-to-number (match-string 1))
@@ -105,7 +105,7 @@ Else, they will never be automatically removed from the *cvs* buffer."
 
 (defcustom cvs-auto-remove-directories 'handled
   "*If ALL, directory entries will never be shown.
-If HANLDED, only non-handled directories will 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)))
@@ -137,8 +137,9 @@ current line.  See also `cvs-invert-ignore-marks'"
   :group 'pcl-cvs
   :type '(boolean))
 
-(defvar cvs-diff-ignore-marks t
-  "Obsolete: use `cvs-invert-ignore-marks' instead.")
+(defvar cvs-diff-ignore-marks t)
+(make-obsolete-variable 'cvs-diff-ignore-marks
+                        'cvs-invert-ignore-marks)
 
 (defcustom cvs-invert-ignore-marks
   (let ((l ()))
@@ -173,8 +174,9 @@ 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*"
-  "Obsolete variable: use `cvs-buffer-name-alist' instead.")
+(defvar cvs-diff-buffer-name "*cvs-diff*")
+(make-obsolete-variable 'cvs-diff-buffer-name
+                        'cvs-buffer-name-alist)
 
 (defcustom cvs-find-file-and-jump nil
   "Jump to the modified area when finding a file.
@@ -247,9 +249,6 @@ Output from cvs is placed here for asynchronous commands.")
   :type '(choice (const :tag "Ediff" (cvs-ediff-diff . cvs-ediff-merge))
                 (const :tag "Emerge" (cvs-emerge-diff . cvs-emerge-merge))))
 
-(defvar pcl-cvs-load-hook nil
-  "Run after loading pcl-cvs.")
-
 (defvar cvs-mode-hook nil
   "Run after `cvs-mode' was setup.")
 
@@ -303,6 +302,8 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ("d" "diff" .      cvs-mode-diff)
     ("b" "backup" .    cvs-mode-diff-backup)
     ("h" "head" .      cvs-mode-diff-head)
+    ("r" "repository" .        cvs-mode-diff-repository)
+    ("y" "yesterday" . cvs-mode-diff-yesterday)
     ("v" "vendor" .    cvs-mode-diff-vendor))
   "Keymap for diff-related operations in `cvs-mode'."
   :name "Diff")
@@ -324,7 +325,8 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ("q" .     cvs-bury-buffer)
     ("z" .     kill-this-buffer)
     ("F" .     cvs-mode-set-flags)
-    ("\M-f" .  cvs-mode-force-command)
+    ;; ("\M-f" .       cvs-mode-force-command)
+    ("!" .     cvs-mode-force-command)
     ("\C-c\C-c" . cvs-mode-kill-process)
     ;; marking
     ("m" .     cvs-mode-mark)
@@ -372,7 +374,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ("r" .     cvs-mode-remove)
     ("s" .     cvs-mode-status)
     ("t" .     cvs-mode-tag)
-    ;;("v" .   cvs-mode-diff-vendor)
+    ("v" .     cvs-mode-view-file)
     ("x" .     cvs-mode-remove-handled)
     ;; cvstree bindings
     ("+" .     cvs-mode-tree)
@@ -410,6 +412,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ["Update"                  cvs-mode-update         (cvs-enabledp 'update)]
     ["Re-examine"              cvs-mode-examine        t]
     ["Commit"                  cvs-mode-commit-setup   (cvs-enabledp 'commit)]
+    ["Tag"                     cvs-mode-tag            (cvs-enabledp (when cvs-force-dir-tag 'tag))]
     ["Undo changes"            cvs-mode-undo           (cvs-enabledp 'undo)]
     ["Add"                     cvs-mode-add            (cvs-enabledp 'add)]
     ["Remove"                  cvs-mode-remove         (cvs-enabledp 'remove)]
@@ -433,7 +436,9 @@ This variable is buffer local and only used in the *cvs* buffer.")
   :group 'pcl-cvs)
 
 (easy-mmode-defmap cvs-minor-mode-map
-  `((,cvs-minor-mode-prefix . cvs-mode-map))
+  `((,cvs-minor-mode-prefix . cvs-mode-map)
+    ("e" . (menu-item nil cvs-mode-edit-log
+           :filter (lambda (x) (if (derived-mode-p 'log-view-mode) x)))))
   "Keymap for `cvs-minor-mode', used in buffers related to PCL-CVS.")
 
 (defvar cvs-buffer nil
@@ -475,7 +480,7 @@ It is expected to call the function.")
     (define-key m [examine]
       '(menu-item "Examine Directory" cvs-examine
                  :help "Examine the current state of a workarea"))
-    m))
+    (fset 'cvs-global-menu m)))
 
 
 ;; cvs-1.10 and above can take file arguments in other directories
@@ -502,4 +507,5 @@ message and replace it with a message tell you to change this variable.")
 ;;
 (provide 'pcvs-defs)
 
+;; arch-tag: c7c701d0-d1d4-4aa9-a302-007bb03aca5e
 ;;; pcvs-defs.el ends here