(vc-menu-map): New entry "Update to Latest Version", which calls

vc-update.  Use the term "Base Version" instead of "Last Version"
for the entries "Revert" and "Compare".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f34d8921c96f8d095111e23f1fcb64c5939967f..8d4c05efcc0076d665ec39c56173636bdc5f8604 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,7 +2,12 @@
 
        * vc.el (vc-revert-buffer): If the buffer is not saved, prompt
        the user to do that first.
+       (vc-update): New function.
 
+       * vc-hooks.el (vc-menu-map): New entry "Update to Latest Version",
+       which calls vc-update.  Use the term "Base Version" instead of
+       "Last Version" for the entries "Revert" and "Compare".
+       
 2002-02-28  Kim F. Storm  <storm@cua.dk>
 
        * simple.el (shell-command-on-region): Report non-zero exit

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 5840491fa0f7fc19f3c0b5abdeaed857f1d25e58..24c16e4b0d83fb300ca5002fd828abb4ee2994d7 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-hooks.el,v 1.137 2001/12/14 07:58:33 spiegel Exp $
+;; $Id: vc-hooks.el,v 1.138 2002/02/21 20:56:58 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -724,16 +724,18 @@ Used in `find-file-not-found-hooks'."
   (define-key vc-menu-map [vc-rename-file] '("Rename File" . vc-rename-file))
   (define-key vc-menu-map [vc-version-other-window]
     '("Show Other Version" . vc-version-other-window))
-  (define-key vc-menu-map [vc-diff] '("Compare with Last Version" . vc-diff))
+  (define-key vc-menu-map [vc-diff] '("Compare with Base Version" . vc-diff))
   (define-key vc-menu-map [vc-update-change-log]
     '("Update ChangeLog" . vc-update-change-log))
   (define-key vc-menu-map [vc-print-log] '("Show History" . vc-print-log))
   (define-key vc-menu-map [separator2] '("----"))
-  (define-key vc-menu-map [undo] '("Undo Last Check-In" . vc-cancel-version))
-  (define-key vc-menu-map [vc-revert-buffer]
-    '("Revert to Last Version" . vc-revert-buffer))
   (define-key vc-menu-map [vc-insert-header]
     '("Insert Header" . vc-insert-headers))
+  (define-key vc-menu-map [undo] '("Undo Last Check-In" . vc-cancel-version))
+  (define-key vc-menu-map [vc-revert-buffer]
+    '("Revert to Base Version" . vc-revert-buffer))
+  (define-key vc-menu-map [vc-update]
+    '("Update to Latest Version" . vc-update))
   (define-key vc-menu-map [vc-next-action] '("Check In/Out" . vc-next-action))
   (define-key vc-menu-map [vc-register] '("Register" . vc-register)))