emacs: lisp/vc-hooks.el comparison

comparison lisp/vc-hooks.el @ 91048:d38543a1c0f9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 880-885) - Remove RCS keywords from doc/misc/cc-mode.texi - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264

author	Miles Bader <miles@gnu.org>
date	Sat, 13 Oct 2007 05:53:03 +0000
parents	14c4a6aac623 708abc311fa6
children	1251cabc40b7

comparison

equal deleted inserted replaced

-:1cf8ecbaa1dc
+:d38543a1c0f9
 on the result of a previous call, use `vc-backend' instead.  If the
 file was previously registered under a certain backend, then that
 backend is tried first."
 (let (handler)
 (cond
-((string-match vc-ignore-dir-regexp (file-name-directory file)) nil)
+((and (file-name-directory file) (string-match vc-ignore-dir-regexp (file-name-directory file)))
+nil)
 ((and (boundp 'file-name-handler-alist)
 (setq handler (find-file-name-handler file 'vc-registered)))
 ;; handler should set vc-backend and return t if registered
 (funcall handler 'vc-registered file))
 (t
 with locking; it represents an erroneous condition that
 should be resolved by the user (vc-next-action will
 prompt the user to do it)."
 ;; FIXME: New (sub)states needed (?):
 ;; - `added' (i.e. `edited' but with no base version yet,
-;;            typically represented by vc-workfile-version = "0")
+;;            typically represented by vc-working-revision = "0")
 ;; - `conflict' (i.e. `edited' with conflict markers)
 ;; - `removed'
 ;; - `copied' and `moved' (might be handled by `removed' and `added')
 (or (vc-file-getprop file 'vc-state)
 (if (and (> (length file) 0) (vc-backend file))
 'diff))))
 (not (eq (caddr err) 4)))
 (signal (car err) (cdr err))
 (vc-call diff (list file)))))))
-(defun vc-workfile-version (file)
+(defun vc-working-revision (file)
 "Return the repository version from which FILE was checked out.
 If FILE is not registered, this function always returns nil."
-(or (vc-file-getprop file 'vc-workfile-version)
+(or (vc-file-getprop file 'vc-working-revision)
 (if (vc-backend file)
-(vc-file-setprop file 'vc-workfile-version
+(vc-file-setprop file 'vc-working-revision
-(vc-call workfile-version file)))))
+(vc-call working-revision file)))))
 (defun vc-default-registered (backend file)
 "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates."
 (let ((sym (vc-make-backend-sym backend 'master-templates)))
 (unless (get backend 'vc-templates-grabbed)
 (if regexp
 (concat (regexp-quote (file-name-nondirectory file))
 "\\.~.+" (unless manual "\\.") "~")
 (expand-file-name (concat (file-name-nondirectory file)
 ".~" (subst-char-in-string
-?/ ?_ (or rev (vc-workfile-version file)))
+?/ ?_ (or rev (vc-working-revision file)))
 (unless manual ".") "~")
 (file-name-directory file))))
 (defun vc-delete-automatic-version-backups (file)
 "Delete all existing automatic version backups for FILE."
 This function assumes that the file is registered."
 (setq backend (symbol-name backend))
 (let ((state   (vc-state file))
 	(state-echo nil)
-	(rev     (vc-workfile-version file)))
+	(rev     (vc-working-revision file)))
 (propertize
 (cond ((or (eq state 'up-to-date)
 		(eq state 'needs-patch))
 	    (setq state-echo "Up to date file")
 	    (concat backend "-" rev))
 (define-key map "s" 'vc-create-snapshot)
 (define-key map "u" 'vc-revert)
 (define-key map "v" 'vc-next-action)
 (define-key map "+" 'vc-update)
 (define-key map "=" 'vc-diff)
-(define-key map "~" 'vc-version-other-window)
+(define-key map "~" 'vc-revision-other-window)
 map))
 (fset 'vc-prefix-map vc-prefix-map)
 (define-key global-map "\C-xv" 'vc-prefix-map)
 (defvar vc-menu-map
 '("Create Snapshot" . vc-create-snapshot))
 (define-key map [vc-directory] '("VC Directory Listing" . vc-directory))
 (define-key map [separator1] '("----"))
 (define-key map [vc-annotate] '("Annotate" . vc-annotate))
 (define-key map [vc-rename-file] '("Rename File" . vc-rename-file))
-(define-key map [vc-version-other-window]
+(define-key map [vc-revision-other-window]
-'("Show Other Version" . vc-version-other-window))
+'("Show Other Version" . vc-revision-other-window))
 (define-key map [vc-diff] '("Compare with Base Version" . vc-diff))
 (define-key map [vc-update-change-log]
 '("Update ChangeLog" . vc-update-change-log))
 (define-key map [vc-print-log] '("Show History" . vc-print-log))
 (define-key map [separator2] '("----"))
 ;; 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-revision-other-window 'menu-enable 'vc-mode)
 ;;(put 'vc-diff 'menu-enable 'vc-mode)
 ;;(put 'vc-update-change-log 'menu-enable
 ;;     '(member (vc-buffer-backend) '(RCS CVS)))
 ;;(put 'vc-print-log 'menu-enable 'vc-mode)
 ;;(put 'vc-rollback 'menu-enable 'vc-mode)

Mercurial > emacs

comparison lisp/vc-hooks.el @ 91048:d38543a1c0f9