[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc-dir.el vc-dispatcher.el
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc-dir.el vc-dispatcher.el |
Date: |
Fri, 24 Jul 2009 05:41:24 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 09/07/24 05:41:24
Modified files:
lisp : ChangeLog vc-dir.el vc-dispatcher.el
Log message:
* vc-dispatcher.el (vc-resynch-buffers-in-directory): Make sure
the buffer we try to sync is current when calling
vc-resynch-buffer.
* vc-dir.el (vc-dir-resynch-file): Make sure vc-dir-update does
not show up to date files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15855&r2=1.15856
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dir.el?cvsroot=emacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dispatcher.el?cvsroot=emacs&r1=1.67&r2=1.68
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15855
retrieving revision 1.15856
diff -u -b -r1.15855 -r1.15856
--- ChangeLog 24 Jul 2009 03:52:42 -0000 1.15855
+++ ChangeLog 24 Jul 2009 05:41:17 -0000 1.15856
@@ -1,3 +1,12 @@
+2009-07-24 Dan Nicolaescu <address@hidden>
+
+ * vc-dispatcher.el (vc-resynch-buffers-in-directory): Make sure
+ the buffer we try to sync is current when calling
+ vc-resynch-buffer.
+
+ * vc-dir.el (vc-dir-resynch-file): Make sure vc-dir-update does
+ not show up to date files.
+
2009-07-24 Glenn Morris <address@hidden>
* emacs-lisp/elint.el (elint-current-buffer, elint-defun):
Index: vc-dir.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-dir.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- vc-dir.el 10 Apr 2009 14:19:17 -0000 1.39
+++ vc-dir.el 24 Jul 2009 05:41:24 -0000 1.40
@@ -866,9 +866,10 @@
(when (vc-string-prefix-p ddir file)
(if (file-directory-p file)
(vc-dir-resync-directory-files file)
+ (let ((state (vc-dir-recompute-file-state file ddir)))
(vc-dir-update
- (list (vc-dir-recompute-file-state file ddir))
- status-buf)))))))
+ (list state)
+ status-buf (eq (cadr state) 'up-to-date)))))))))
;; We didn't find any vc-dir buffers, remove the hook, it is
;; not needed.
(unless found-vc-dir-buf
Index: vc-dispatcher.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- vc-dispatcher.el 5 Jan 2009 03:19:52 -0000 1.67
+++ vc-dispatcher.el 24 Jul 2009 05:41:24 -0000 1.68
@@ -484,7 +484,8 @@
(dolist (buffer (buffer-list))
(let ((fname (buffer-file-name buffer)))
(when (and fname (vc-string-prefix-p directory fname))
- (vc-resynch-buffer fname keep noquery)))))
+ (with-current-buffer buffer
+ (vc-resynch-buffer fname keep noquery))))))
(defun vc-resynch-buffer (file &optional keep noquery)
"If FILE is currently visited, resynch its buffer."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog vc-dir.el vc-dispatcher.el,
Dan Nicolaescu <=