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

(cvs-menu): Add a few entries.

2 files changed, 39 insertions, 20 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d1f7ee0ac4f..53a5f0db07d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2001-04-13  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * pcvs-defs.el (cvs-mode-map): Bind C-o like in dired.
+        (cvs-menu): Add a few entries.
+
+        * pcvs.el (cvs-addto-collection): Don't merge MESSAGE fileinfos.
+        (cvs-update-filter): Only advertise `cvs-mode-delete-lock' if the
+        lock file appears to be reachable from Emacs.
+        (cvs-mode-mark-on-state, cvs-mode-display-file): New functions.
+        (cvs-mode-find-file): Look for cvs-header-face rather than
+        cvs-dirname-face (which doesn't exist).
+        (cvs-mode-find-file): Allow `other' to be set to `dont-select'.
+
+        * pcvs-parse.el (cvs-parse-run-table): Remove misleading text.
+
 2001-04-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * emulation/pc-select.el (pc-selection-mode): Don't turn on
@@ -11,23 +26,23 @@
 
 2001-04-11  John Wiegley  <johnw@gnu.org>
 
-        * eshell/em-ls.el (eshell-ls-insert-directory): Set
-        font-lock-defaults to nil, to prevent fontification in dired
+        * eshell/em-ls.el (eshell-ls-insert-directory):
+        Set font-lock-defaults to nil, to prevent fontification in dired
         buffers, if Eshell's ls is being used.
 
 2001-04-11  John Wiegley  <johnw@gnu.org>
 
-        * calendar/timeclock.el (timeclock-completing-read): new function.
-        (timeclock-ask-for-project, timeclock-ask-for-reason): Call
-        `timeclock-completing-read'.
+        * calendar/timeclock.el (timeclock-completing-read): New function.
+        (timeclock-ask-for-project, timeclock-ask-for-reason):
+        Call `timeclock-completing-read'.
 
         * eshell/em-alias.el (eshell-command-aliased-p): `assoc' was
         required where `member' was being used.
 
 2001-04-11  Colin Walters  <walters@cis.ohio-state.edu>
 
-        * eshell/em-hist.el (eshell-previous-matching-input): Don't
-        display "History item" if the the minibuffer is active.
+        * eshell/em-hist.el (eshell-previous-matching-input):
+        Don't display "History item" if the the minibuffer is active.
 
 2001-04-11  Gerd Moellmann  <gerd@gnu.org>
 
@@ -36,26 +51,24 @@
 
 2001-04-11  Eli Zaretskii  <eliz@is.elta.co.il>
 
-        * textmodes/texinfo.el (texinfo-font-lock-keywords): Add
-        fontification for @value, @dfn, @dmn, @acronym, @anchor, and
+        * textmodes/texinfo.el (texinfo-font-lock-keywords):
+        Add fontification for @value, @dfn, @dmn, @acronym, @anchor, and
         @inforef.  Add an OVERRIDE of `keep' to highlight specs of
         keywords whose arguments routinely include @@.
 
 2001-04-10  Gerd Moellmann  <gerd@gnu.org>
 
-        * emacs-lisp/advice.el (ad-make-advised-definition): Construct
-        advice for subrs differently.
+        * emacs-lisp/advice.el (ad-make-advised-definition):
+        Construct advice for subrs differently.
 
         * textmodes/paragraphs.el (forward-sentence): Put the sentence-end
-        regexp in parentheses when building the regexp for searching
-        backwards.
+        regexp in parentheses when building the regexp for searching backwards.
 
         * simple.el (completion-list-mode-finish): New function.
-        (toplevel): Add completion-list-mode-finish to
-        temp-buffer-show-hook.
+        (toplevel): Add completion-list-mode-finish to temp-buffer-show-hook.
 
         * language/european.el ("Polish"): Change sample text.
-        From: jsbien@mimuw.edu.pl (Janusz S. Bie,Bq(B).
+        From jsbien@mimuw.edu.pl (Janusz S. Bie,Bq(B).
 
         * progmodes/sh-script.el (sh-indent-line): Add optional PREFIX-ARG
         parameter.
@@ -76,15 +89,15 @@
         (ps-footer-pad, ps-footer-font-size-internal): New internal vars for
         footers.
         (ps-setup, ps-get-page-dimensions, ps-generate-header-line)
-        (ps-generate-header, ps-begin-file, ps-begin-job, ps-begin-page): Code
-        fix.
+        (ps-generate-header, ps-begin-file, ps-begin-job, ps-begin-page):
+        Code fix.
         (ps-prologue-file): Indentation fix.
         (ps-print-quote): Fun eliminated.
         (ps-value, ps-get, ps-put, ps-del): New funs for alist handling.
         (ps-output-frame-properties): New fun.
         (ps-fonts, ps-font-number, ps-rgb-color, ps-end-page, ps-next-page)
         (ps-skip-newline): Replace defun by defsubst.
-        
+
 2001-04-05  Colin Walters <walters@cis.ohio-state.edu>
 
         * eshell/eshell.el (eshell-command): Needed a "%s" format
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index fce6a6ccfec..00b534a837c 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-defs.el,v 1.10 2000/12/18 03:17:31 monnier Exp $
+;; Revision: $Id: pcvs-defs.el,v 1.11 2001/03/07 00:18:27 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -329,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)
@@ -377,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)))
@@ -390,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]
@@ -412,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]
     "----"