(help-make-xrefs): Default info references to an

[gnu-emacs] / lisp / vc-hooks.el

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index a6b455f8eefb390d5f412b99c9382b351c2c68dc..46630d24a573f51062f3ebbba09903f2a1cd61a2 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -5,7 +5,7 @@
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
 
-;; $Id: vc-hooks.el,v 1.106 1998/04/20 02:00:00 done Exp spiegel $
+;; $Id: vc-hooks.el,v 1.112 1998/09/14 17:26:39 fx Exp kwzh $
 
 ;; This file is part of GNU Emacs.
 
@@ -338,7 +338,10 @@ similarly for other version control systems."
               ((string-match "Needs Merge"         status) 'needs-merge)
               ((string-match "Needs \\(Checkout\\|Patch\\)" status) 
                'needs-checkout)
-              ((string-match "Unresolved Conflict" status) 'unresolved-conflict)
+              ((string-match "Unresolved Conflict" status) 
+              'unresolved-conflict)
+             ((string-match "File had conflicts on merge" status)
+              'unresolved-conflict)
               ((string-match "Locally Added"       status) 'locally-added)
               ((string-match "New file!"           status) 'locally-added)
               (t 'unknown))))))))))
@@ -433,10 +436,11 @@ similarly for other version control systems."
       (cond  
        ;; search for $Id or $Header
        ;; -------------------------
-       ((or (and (search-forward "$Id: " nil t)
+       ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file.
+       ((or (and (search-forward "$Id\ : " nil t)
                 (looking-at "[^ ]+ \\([0-9.]+\\) "))
            (and (progn (goto-char (point-min))
-                       (search-forward "$Header: " nil t))
+                       (search-forward "$Header\ : " nil t))
                 (looking-at "[^ ]+ \\([0-9.]+\\) ")))
        (goto-char (match-end 0))
        ;; if found, store the revision number ...
@@ -958,7 +962,10 @@ For CVS, the full name of CVS/Entries is returned."
   "Change read-only status of current buffer, perhaps via version control.
 If the buffer is visiting a file registered with version control,
 then check the file in or out.  Otherwise, just change the read-only flag
-of the buffer.  With prefix argument, ask for version number."
+of the buffer.
+With prefix argument, ask for version number to check in or check out.
+Check-out of a specified version number does not lock the file;
+to do that, use this command a second time with no argument."
   (interactive "P")
   (if (or (and (boundp 'vc-dired-mode) vc-dired-mode)
           ;; use boundp because vc.el might not be loaded
@@ -1115,6 +1122,9 @@ control system name."
 (defun vc-file-not-found-hook ()
   "When file is not found, try to check it out from RCS or SCCS.
 Returns t if checkout was successful, nil otherwise."
+  ;; When a file does not exist, ignore cached info about it
+  ;; from a previous visit.
+  (vc-file-clearprops buffer-file-name)
   (if (and (not vc-ignore-vc-files) 
            (vc-backend buffer-file-name))
       (save-excursion
@@ -1167,7 +1177,7 @@ Returns t if checkout was successful, nil otherwise."
     '("Retrieve Snapshot" . vc-retrieve-snapshot))
   (define-key vc-menu-map [vc-create-snapshot]
     '("Create Snapshot" . vc-create-snapshot))
-  (define-key vc-menu-map [vc-directory] '("Show Locked Files" . vc-directory))
+  (define-key vc-menu-map [vc-directory] '("VC Directory Listing" . vc-directory))
   (define-key vc-menu-map [separator1] '("----"))
   (define-key vc-menu-map [vc-annotate] '("Annotate" . vc-annotate))
   (define-key vc-menu-map [vc-rename-file] '("Rename File" . vc-rename-file))
@@ -1186,18 +1196,22 @@ Returns t if checkout was successful, nil otherwise."
   (define-key vc-menu-map [vc-next-action] '("Check In/Out" . vc-next-action))
   (define-key vc-menu-map [vc-register] '("Register" . vc-register)))
 
-(put 'vc-rename-file 'menu-enable 'vc-mode)
-(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS))
-(put 'vc-version-other-window 'menu-enable 'vc-mode)
-(put 'vc-diff 'menu-enable 'vc-mode)
-(put 'vc-update-change-log 'menu-enable
-     '(eq (vc-buffer-backend) 'RCS))
-(put 'vc-print-log 'menu-enable 'vc-mode)
-(put 'vc-cancel-version 'menu-enable 'vc-mode)
-(put 'vc-revert-buffer 'menu-enable 'vc-mode)
-(put 'vc-insert-headers 'menu-enable 'vc-mode)
-(put 'vc-next-action 'menu-enable 'vc-mode)
-(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
+;;; These are not correct and it's not currently clear how doing it
+;;; better (with more complicated expressions) might slow things down
+;;; on older systems.
+
+;;;(put 'vc-rename-file 'menu-enable 'vc-mode)
+;;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS))
+;;;(put 'vc-version-other-window 'menu-enable 'vc-mode)
+;;;(put 'vc-diff 'menu-enable 'vc-mode)
+;;;(put 'vc-update-change-log 'menu-enable
+;;;     '(eq (vc-buffer-backend) 'RCS))
+;;;(put 'vc-print-log 'menu-enable 'vc-mode)
+;;;(put 'vc-cancel-version 'menu-enable 'vc-mode)
+;;;(put 'vc-revert-buffer 'menu-enable 'vc-mode)
+;;;(put 'vc-insert-headers 'menu-enable 'vc-mode)
+;;;(put 'vc-next-action 'menu-enable 'vc-mode)
+;;;(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
 
 (provide 'vc-hooks)