Mercurial > emacs

changeset 94543:135f7ef84766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More preparation for removing dired.
author Eric S. Raymond <esr@snark.thyrsus.com>
date Fri, 02 May 2008 07:47:18 +0000
parents 16651da1e3ed
children aa5169cbd932
files lisp/ChangeLog lisp/vc-hooks.el lisp/vc.el
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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  <dann@ics.uci.edu>
 
--- 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
--- 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)