diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/vc-dispatcher.el | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6427a918dd8..a4413bcbf96 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-10-01 Stefan Monnier <monnier@iro.umontreal.ca> + + * 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 <rgm@gnu.org> * emacs-lisp/chart.el (chart-zap-chars, chart-bar-quickie) @@ -87,7 +93,7 @@ 2009-09-30 Eric Ludlam <zappo@gnu.org> - * emacs-lisp/eieio.el (boolean-p): Deleted. + * emacs-lisp/eieio.el (boolean-p): Delete. 2009-09-30 Sascha Wilde <wilde@sha-bang.de> @@ -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". diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el index 07cf4a1ad28..bf3da4e6904 100644 --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el @@ -461,7 +461,7 @@ modifications by the dispatcher client code, rather than user 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 @@ editing!" (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) |