mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

(vc-resynch-window): Don't revert a buffer which has no associated file.

Browse source 
(vc-resynch-buffer): Use vc-dir-buffers.
This commit is contained in:
Stefan Monnier 2009-10-01 03:32:25 +00:00
parent 2f10955c58
commit cf88559514
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -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".

4
lisp/vc-dispatcher.el
View file

@ -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)