[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el,v |
Date: |
Thu, 28 Feb 2008 03:35:24 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/02/28 03:35:23
Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -b -r1.541 -r1.542
--- vc.el 23 Feb 2008 06:32:11 -0000 1.541
+++ vc.el 28 Feb 2008 03:35:21 -0000 1.542
@@ -595,7 +595,10 @@
;; adjustments.
;;
;; - when changing a file whose directory is shown in the vc-status
-;; buffer, it should be added there are "modified". (PCL-CVS does this).
+;; buffer, it should be added there as "modified". (PCL-CVS does this).
+;;
+;; - Update the vc-status buffers after vc operations, implement the
+;; equivalent of vc-dired-resynch-file.
;;
;; - vc-status needs a toolbar.
;;
@@ -1407,7 +1410,7 @@
(list buffer-file-name))
((and vc-parent-buffer (or (buffer-file-name vc-parent-buffer)
(with-current-buffer vc-parent-buffer
- vc-dired-mode)))
+ (or vc-dired-mode (eq major-mode
'vc-status-mode)))))
(progn
(set-buffer vc-parent-buffer)
(vc-deduce-fileset)))
@@ -1541,7 +1544,7 @@
(dolist (file files)
(let ((visited (get-file-buffer file)))
(when visited
- (if vc-dired-mode
+ (if (or vc-dired-mode (eq major-mode 'vc-status-mode))
(switch-to-buffer-other-window visited)
(set-buffer visited))
;; Check relation of buffer and file, and make sure
@@ -1811,7 +1814,7 @@
\(current one if no file). AFTER-HOOK specifies the local value
for `vc-log-after-operation-hook'."
(let ((parent
- (if (eq major-mode 'vc-dired-mode)
+ (if (or (eq major-mode 'vc-dired-mode) (eq major-mode
'vc-status-mode))
;; If we are called from VC dired, the parent buffer is
;; the current buffer.
(current-buffer)
@@ -1951,7 +1954,7 @@
;; Sync parent buffer in case the user modified it while editing the comment.
;; But not if it is a vc-dired buffer.
(with-current-buffer vc-parent-buffer
- (or vc-dired-mode (vc-buffer-sync)))
+ (or vc-dired-mode (eq major-mode 'vc-status-mode) (vc-buffer-sync)))
(if (not vc-log-operation)
(error "No log operation is pending"))
;; save the parameters held in buffer-local variables
@@ -1983,7 +1986,7 @@
(mapc
(lambda (file) (vc-resynch-buffer file vc-keep-workfiles t))
log-fileset))
- (if vc-dired-mode
+ (if (or vc-dired-mode (eq major-mode 'vc-status-mode))
(dired-move-to-filename))
(run-hooks after-hook 'vc-finish-logentry-hook)))
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/14
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/16
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/18
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/19
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/19
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/21
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/21
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/22
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/23
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v,
Dan Nicolaescu <=
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/27
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Dan Nicolaescu, 2008/02/29
- [Emacs-diffs] Changes to emacs/lisp/vc.el,v, Nick Roberts, 2008/02/29