(cvs-menu): Add cvs-mode-mark and cvs-mode-unmark.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f0e10ec37af69e031e17d6f72cb421e0079bc68..37faa71e695f3c63b9886ab69f1304b75c3ca07f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * pcvs-defs.el (cvs-menu): Add cvs-mode-mark and cvs-mode-unmark.
+
 2005-06-21  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
        * calendar/appt.el (appt-make-list): Activate the package, if
@@ -541,6 +545,7 @@
        variables, unless either `gtk' is boundp or this isn't a
        `windows-nt' build.
 
+>>>>>>> 1.7817
 2005-06-13  Lute Kamstra  <lute@gnu.org>
 
        * abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
@@ -1448,6 +1453,7 @@
 
        * simple.el (filter-buffer-substring): Fix typo in docstring.
 
+>>>>>>> 1.7768
 2005-05-31  Richard M. Stallman  <rms@gnu.org>
 
        * progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE.
@@ -1484,6 +1490,7 @@
        * textmodes/tex-mode.el (tex-compile-commands, tex-compile)
        (tex-start-tex): Undo all but the last part of the 2005-05-28 change.
 
+>>>>>>> 1.7646
 2005-05-30  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
        * calendar/diary-lib.el (mark-included-diary-files): Only kill

diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index 62c0d62d16145239424959738efb2088074278cb..394c3580945a3f4069b9ee84741d0a7e3fccb561 100644 (file)
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -421,9 +421,11 @@ This variable is buffer local and only used in the *cvs* buffer.")
     ["Ignore"                  cvs-mode-ignore         (cvs-enabledp 'ignore)]
     ["Add ChangeLog"           cvs-mode-add-change-log-entry-other-window t]
     "----"
+    ["Mark"                     cvs-mode-mark 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"                   cvs-mode-unmark        t]
     ["Unmark all"              cvs-mode-unmark-all-files t]
     ["Hide handled"            cvs-mode-remove-handled t]
     "----"