# HG changeset patch # User Eric S. Raymond # Date 1209714438 0 # Node ID 135f7ef847665cb3af48cc19360211c90a9afb07 # Parent 16651da1e3ed0bbb4d6d6770fba24bc08d2a1999 More preparation for removing dired. diff -r 16651da1e3ed -r 135f7ef84766 lisp/ChangeLog --- a/lisp/ChangeLog Fri May 02 07:38:11 2008 +0000 +++ b/lisp/ChangeLog Fri May 02 07:47:18 2008 +0000 @@ -7,6 +7,9 @@ * vc-hooks.el (vc-toggle-read-only): Throw an error when a user tries this on a version-controlled buffer. it will do useless or actively bad things on any version control system newer than RCS. + * vc-hooks.el (vc-dired-resynch-file), + vc.el (vc-dired-resynch-file): Change name of primitive to + vc-directory-resynch-file, preoaring to remove dired. 2008-05-02 Dan Nicolaescu diff -r 16651da1e3ed -r 135f7ef84766 lisp/vc-hooks.el --- a/lisp/vc-hooks.el Fri May 02 07:38:11 2008 +0000 +++ b/lisp/vc-hooks.el Fri May 02 07:47:18 2008 +0000 @@ -751,7 +751,7 @@ (vc-call make-version-backups-p file) (vc-make-version-backup file))))) -(declare-function vc-dired-resynch-file "vc" (file)) +(declare-function vc-directory-resynch-file "vc" (file)) (defun vc-after-save () "Function to be called by `basic-save-buffer' (in files.el)." @@ -775,7 +775,7 @@ (when (featurep 'vc) ;; If VC is not loaded, then there can't be ;; any VC Dired buffer to synchronize. - (vc-dired-resynch-file file))))) + (vc-directory-resynch-file file))))) (defvar vc-menu-entry '(menu-item "Version Control" vc-menu-map diff -r 16651da1e3ed -r 135f7ef84766 lisp/vc.el --- a/lisp/vc.el Fri May 02 07:38:11 2008 +0000 +++ b/lisp/vc.el Fri May 02 07:47:18 2008 +0000 @@ -1896,7 +1896,7 @@ (when buffer (with-current-buffer buffer (vc-resynch-window file keep noquery))))) - (vc-dired-resynch-file file) + (vc-directory-resynch-file file) (when (memq 'vc-dir-mark-buffer-changed after-save-hook) (let ((buffer (get-file-buffer file))) (vc-dir-mark-buffer-changed file)))) @@ -2726,8 +2726,9 @@ (push buffer result))))) (nreverse result))) -(defun vc-dired-resynch-file (file) +(defun vc-directory-resynch-file (file) "Update the entries for FILE in any VC Dired buffers that list it." + ;;FIXME This needs to be implemented so it works for vc-dir (let ((buffers (vc-dired-buffers-for-dir (file-name-directory file)))) (when buffers (mapcar (lambda (buffer)