Mercurial > emacs
changeset 105329:fa9bcb68092e
(vc-resynch-window): Don't revert a buffer which has no associated file.
(vc-resynch-buffer): Use vc-dir-buffers.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 01 Oct 2009 03:32:25 +0000 |
| parents | 2f2bc20297c6 |
| children | 7660578a04ee |
| files | lisp/ChangeLog lisp/vc-dispatcher.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Oct 01 03:08:03 2009 +0000 +++ b/lisp/ChangeLog Thu Oct 01 03:32:25 2009 +0000 @@ -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".
--- a/lisp/vc-dispatcher.el Thu Oct 01 03:08:03 2009 +0000 +++ b/lisp/vc-dispatcher.el Thu Oct 01 03:32:25 2009 +0000 @@ -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)