Commit 80169ab5 authored by Eric S. Raymond's avatar Eric S. Raymond

vc-error-occurred: moved to vc-hooks.el in order for ^X^F of a

nonexistent file to work.
parent 2dd8d31b
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
;; Copyright (C) 1992 Free Software Foundation, Inc. ;; Copyright (C) 1992 Free Software Foundation, Inc.
;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Version: 4.0 ;; Version: 5.0
;; $Id: vc-hooks.el,v 1.6 1992/10/24 20:07:08 rms Exp rms $ ;; $Id: vc-hooks.el,v 1.48 1993/03/15 21:42:57 esr Exp $
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -51,6 +51,9 @@ the make-backup-files variable. Otherwise, prevents backups being made.") ...@@ -51,6 +51,9 @@ the make-backup-files variable. Otherwise, prevents backups being made.")
;; control state of a file is expensive to derive --- we don't ;; control state of a file is expensive to derive --- we don't
;; want to recompute it even on every find. ;; want to recompute it even on every find.
(defmacro vc-error-occurred (&rest body)
(list 'condition-case nil (cons 'progn (append body '(nil))) '(error t)))
(defvar vc-file-prop-obarray [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] (defvar vc-file-prop-obarray [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0]
"Obarray for per-file properties.") "Obarray for per-file properties.")
...@@ -65,40 +68,29 @@ the make-backup-files variable. Otherwise, prevents backups being made.") ...@@ -65,40 +68,29 @@ the make-backup-files variable. Otherwise, prevents backups being made.")
;;; actual version-control code starts here ;;; actual version-control code starts here
(defun vc-registered (file) (defun vc-registered (file)
(let (handler handlers) ;; Search for a master corresponding to the given file
(if (boundp 'file-name-handler-alist) (let ((dirname (or (file-name-directory file) ""))
(save-match-data (basename (file-name-nondirectory file)))
(setq handlers file-name-handler-alist) (catch 'found
(while (and (consp handlers) (null handler)) (mapcar
(if (and (consp (car handlers)) (function (lambda (s)
(stringp (car (car handlers))) (let ((trial (format (car s) dirname basename)))
(string-match (car (car handlers)) file)) (if (and (file-exists-p trial)
(setq handler (cdr (car handlers)))) ;; Make sure the file we found with name
(setq handlers (cdr handlers))))) ;; TRIAL is not the source file itself.
(if handler ;; That can happen with RCS-style names
(funcall handler 'vc-registered file) ;; if the file name is truncated
;; Search for a master corresponding to the given file ;; (e.g. to 14 chars). See if either
(let ((dirname (or (file-name-directory file) "")) ;; directory or attributes differ.
(basename (file-name-nondirectory file))) (or (not (string= dirname
(catch 'found (file-name-directory trial)))
(mapcar (not (equal
(function (lambda (s) (file-attributes file)
(let ((trial (format (car s) dirname basename))) (file-attributes trial)))))
(if (and (file-exists-p trial) (throw 'found (cons trial (cdr s)))))))
;; Make sure the file we found with name vc-master-templates)
;; TRIAL is not the source file itself. nil)
;; That can happen with RCS-style names ))
;; if the file name is truncated
;; (e.g. to 14 chars). See if either
;; directory or attributes differ.
(or (not (string= dirname
(file-name-directory trial)))
(not (equal
(file-attributes file)
(file-attributes trial)))))
(throw 'found (cons trial (cdr s)))))))
vc-master-templates)
nil)))))
(defun vc-backend-deduce (file) (defun vc-backend-deduce (file)
"Return the version-control type of a file, nil if it is not registered" "Return the version-control type of a file, nil if it is not registered"
...@@ -107,7 +99,7 @@ the make-backup-files variable. Otherwise, prevents backups being made.") ...@@ -107,7 +99,7 @@ the make-backup-files variable. Otherwise, prevents backups being made.")
(vc-file-setprop file 'vc-backend (cdr (vc-registered file)))))) (vc-file-setprop file 'vc-backend (cdr (vc-registered file))))))
(defun vc-toggle-read-only () (defun vc-toggle-read-only ()
"If the file in the current buffer is under version control, perform the "If the file in the current buffer id under version control, perform the
logical next version-control action; otherwise, just toggle the buffer's logical next version-control action; otherwise, just toggle the buffer's
read-only flag." read-only flag."
(interactive) (interactive)
...@@ -119,7 +111,6 @@ read-only flag." ...@@ -119,7 +111,6 @@ read-only flag."
"Set `vc-mode-string' to display type of version control for FILE. "Set `vc-mode-string' to display type of version control for FILE.
The value is set in the current buffer, which should be the buffer The value is set in the current buffer, which should be the buffer
visiting FILE." visiting FILE."
(interactive (list buffer-file-name nil))
(let ((vc-type (vc-backend-deduce file))) (let ((vc-type (vc-backend-deduce file)))
(if vc-type (if vc-type
(progn (progn
...@@ -134,9 +125,6 @@ visiting FILE." ...@@ -134,9 +125,6 @@ visiting FILE."
;;; install a call to the above as a find-file hook ;;; install a call to the above as a find-file hook
(defun vc-find-file-hook () (defun vc-find-file-hook ()
;; Recompute whether file is version controlled,
;; if user has killed the buffer and revisited.
(vc-file-setprop buffer-file-name 'vc-backend nil)
(if (and (vc-mode-line buffer-file-name) (not vc-make-backup-files)) (if (and (vc-mode-line buffer-file-name) (not vc-make-backup-files))
(progn (progn
(make-local-variable 'make-backup-files) (make-local-variable 'make-backup-files)
...@@ -170,7 +158,7 @@ Returns t if checkout was successful, nil otherwise." ...@@ -170,7 +158,7 @@ Returns t if checkout was successful, nil otherwise."
(define-key global-map "\C-xv" vc-prefix-map) (define-key global-map "\C-xv" vc-prefix-map)
(define-key vc-prefix-map "a" 'vc-update-change-log) (define-key vc-prefix-map "a" 'vc-update-change-log)
(define-key vc-prefix-map "c" 'vc-cancel-version) (define-key vc-prefix-map "c" 'vc-cancel-version)
(define-key vc-prefix-map "d" 'vc-directory) (define-key vc-prefix-map "=" 'vc-diff)
(define-key vc-prefix-map "h" 'vc-insert-headers) (define-key vc-prefix-map "h" 'vc-insert-headers)
(define-key vc-prefix-map "i" 'vc-register) (define-key vc-prefix-map "i" 'vc-register)
(define-key vc-prefix-map "l" 'vc-print-log) (define-key vc-prefix-map "l" 'vc-print-log)
...@@ -178,9 +166,10 @@ Returns t if checkout was successful, nil otherwise." ...@@ -178,9 +166,10 @@ Returns t if checkout was successful, nil otherwise."
(define-key vc-prefix-map "s" 'vc-create-snapshot) (define-key vc-prefix-map "s" 'vc-create-snapshot)
(define-key vc-prefix-map "u" 'vc-revert-buffer) (define-key vc-prefix-map "u" 'vc-revert-buffer)
(define-key vc-prefix-map "v" 'vc-next-action) (define-key vc-prefix-map "v" 'vc-next-action)
(define-key vc-prefix-map "=" 'vc-diff) (define-key vc-prefix-map "d" 'vc-directory)
)) ))
(provide 'vc-hooks) (provide 'vc-hooks)
;;; vc-hooks.el ends here ;;; vc-hooks.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment