(cvs-mode-map): Bind C-o like in dired.

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

diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index c0fe4bbd57f37d5739f4391985e50dc00c46bb21..00b534a837cd13937e3e308e54158e9f71e993ee 100644 (file)
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -4,8 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Version: $Name:  $
-;; Revision: $Id: pcvs-defs.el,v 1.7 2000/12/06 19:51:40 fx Exp $
+;; Revision: $Id: pcvs-defs.el,v 1.11 2001/03/07 00:18:27 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -29,8 +28,6 @@
 
 ;;; Code:
 
-(defconst pcl-cvs-version "$Name:  $")
-
 (eval-when-compile (require 'cl))
 (require 'pcvs-util)
 
@@ -190,7 +187,7 @@ have no effect."
 (defcustom cvs-buffer-name-alist
   '(("diff" cvs-diff-buffer-name diff-mode)
     ("status" "*cvs-info*" cvs-status-mode)
-    ("tree" (format "*cvs-%s*" cmd) cvs-status-mode)
+    ("tree" "*cvs-info*" cvs-status-mode)
     ("message" "*cvs-commit*" nil log-edit)
     ("log" "*cvs-info*" log-view-mode))
   "*Buffer name and mode to be used for each command.
@@ -299,15 +296,16 @@ This variable is buffer local and only used in the *cvs* buffer.")
   "The default branch used by CVS for vendor code.")
 
 (easy-mmode-defmap cvs-mode-diff-map
-  '(("=" .     cvs-mode-diff)
-    ("b" .     cvs-mode-diff-backup)
-    ("2" .     cvs-mode-idiff-other)
-    ("h" .     cvs-mode-diff-head)
-    ("v" .     cvs-mode-diff-vendor)
-    ("?" .     cvs-mode-diff-help)
-    ("e" .     cvs-mode-idiff)
-    ("E" .     cvs-mode-imerge))
-  "Keymap for diff-related operations in `cvs-mode'.")
+  '(("E" "imerge" .    cvs-mode-imerge)
+    ("=" .             cvs-mode-diff)
+    ("e" "idiff" .     cvs-mode-idiff)
+    ("2" "other" .     cvs-mode-idiff-other)
+    ("d" "diff" .      cvs-mode-diff)
+    ("b" "backup" .    cvs-mode-diff-backup)
+    ("h" "head" .      cvs-mode-diff-head)
+    ("v" "vendor" .    cvs-mode-diff-vendor))
+  "Keymap for diff-related operations in `cvs-mode'."
+  :name "Diff")
 ;; This is necessary to allow correct handling of \\[cvs-mode-diff-map] 
 ;; in substitute-command-keys.
 (fset 'cvs-mode-diff-map cvs-mode-diff-map)
@@ -331,6 +329,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ;; marking
     ("m" .     cvs-mode-mark)
     ("M" .     cvs-mode-mark-all-files)
+    ("S" .     cvs-mode-mark-on-state)
     ("u" .     cvs-mode-unmark)
     ("\C-?".   cvs-mode-unmark-up)
     ("%" .     cvs-mode-mark-matching-files)
@@ -379,6 +378,8 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ;; mouse bindings
     ([mouse-2] . cvs-mode-find-file)
     ([(down-mouse-3)] . cvs-menu)
+    ;; dired-like bindings
+    ("\C-o" .   cvs-mode-display-file)
     ;; Emacs-21 toolbar
     ;;([tool-bar item1] . (menu-item "Examine" cvs-examine :image (image :file "/usr/share/icons/xpaint.xpm" :type xpm)))
     ;;([tool-bar item2] . (menu-item "Update" cvs-update :image (image :file "/usr/share/icons/mail1.xpm" :type xpm)))
@@ -392,6 +393,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
   '("CVS"
     ["Open file.."             cvs-mode-find-file      t]
     [" ..other window"         cvs-mode-find-file-other-window t]
+    ["Display in other window"  cvs-mode-display-file   t]
     ["Interactive merge"       cvs-mode-imerge         t]
     ("View diff"
      ["Interactive diff"       cvs-mode-idiff          t]
@@ -414,6 +416,8 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ["Add ChangeLog"           cvs-mode-add-change-log-entry-other-window t]
     "----"
     ["Mark all"                        cvs-mode-mark-all-files t]
+    ["Mark by regexp..."        cvs-mode-mark-matching-files t]
+    ["Mark by state..."         cvs-mode-mark-on-state t]
     ["Unmark all"              cvs-mode-unmark-all-files t]
     ["Hide handled"            cvs-mode-remove-handled t]
     "----"
@@ -429,7 +433,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
 
 (easy-mmode-defmap cvs-minor-mode-map
   `((,cvs-minor-mode-prefix . cvs-mode-map))
-  "Keymap for `cvs-minor-mode', used in buffers related to pcl-cvs.")
+  "Keymap for `cvs-minor-mode', used in buffers related to PCL-CVS.")
 
 (defvar cvs-buffer nil
   "(Buffer local) The *cvs* buffer associated with this buffer.")