[Emacs-diffs] emacs/lisp ChangeLog vc-dispatcher.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/01 03:32:28

Modified files:
        lisp           : ChangeLog vc-dispatcher.el 

Log message:
        (vc-resynch-window): Don't revert a buffer which has no associated file.
        (vc-resynch-buffer): Use vc-dir-buffers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16309&r2=1.16310
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dispatcher.el?cvsroot=emacs&r1=1.70&r2=1.71

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16309
retrieving revision 1.16310
diff -u -b -r1.16309 -r1.16310
--- ChangeLog   1 Oct 2009 03:08:03 -0000       1.16309
+++ ChangeLog   1 Oct 2009 03:32:25 -0000       1.16310
@@ -1,3 +1,9 @@
+2009-10-01  Stefan Monnier  <address@hidden>
+
+       * vc-dispatcher.el (vc-resynch-window): Don't revert a buffer which
+       has no associated file.
+       (vc-resynch-buffer): Use vc-dir-buffers.
+
 2009-10-01  Glenn Morris  <address@hidden>
 
        * emacs-lisp/chart.el (chart-zap-chars, chart-bar-quickie)
@@ -87,7 +93,7 @@
 
 2009-09-30  Eric Ludlam  <address@hidden>
 
-       * emacs-lisp/eieio.el (boolean-p): Deleted.
+       * emacs-lisp/eieio.el (boolean-p): Delete.
 
 2009-09-30  Sascha Wilde  <address@hidden>
 
@@ -108,8 +114,8 @@
 
        * cedet/semantic/analyze/fcn.el (semantic-scope-find): Fix declaration.
 
-       * cedet/semantic/bovine/gcc.el (semantic-gcc-setup): Replace runtime use
-       of CL function `remove-if-not'.
+       * cedet/semantic/bovine/gcc.el (semantic-gcc-setup): Replace runtime
+       use of CL function `remove-if-not'.
 
        * emacs-lisp/authors.el (authors-ignored-files): Add "js2-mode.el".
 

Index: vc-dispatcher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- vc-dispatcher.el    20 Sep 2009 19:55:39 -0000      1.70
+++ vc-dispatcher.el    1 Oct 2009 03:32:27 -0000       1.71
@@ -461,7 +461,7 @@
 editing!"
   (and (string= buffer-file-name file)
        (if keep
-          (progn
+          (when (file-exists-p file)
             (vc-revert-buffer-internal t noquery)
 
             ;; VC operations might toggle the read-only state.  In
@@ -502,7 +502,7 @@
            (vc-resynch-window file keep noquery))))))
   ;; Try to avoid unnecessary work, a *vc-dir* buffer is only present
   ;; if this is true.
-  (when (memq 'vc-dir-resynch-file after-save-hook)
+  (when vc-dir-buffers
     (vc-dir-resynch-file file)))
 
 (defun vc-buffer-sync (&optional not-urgent)