diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-10-20 20:04:47 +0300 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-10-20 22:07:20 +0300 |
| commit | 513fe25a501b41f9f2aac67f73c8e8730aed81b0 (patch) | |
| tree | 7bbb7d1b1d0b1a8dbac675bae388a5de122fbbdb /lisp/vc/vc-dir.el | |
| parent | 5e4395544c184d9a8702cf05c7aee9329b0b9482 (diff) | |
| download | emacs-513fe25a501b41f9f2aac67f73c8e8730aed81b0.tar.gz emacs-513fe25a501b41f9f2aac67f73c8e8730aed81b0.tar.bz2 emacs-513fe25a501b41f9f2aac67f73c8e8730aed81b0.zip | |
Call vc-dir-defresh after stash operations
* lisp/vc/vc-git.el (vc-git-stash-apply-at-point)
(vc-git-stash-pop-at-point): Call vc-dir-defresh (bug#13960).
* lisp/vc/vc-dir.el (vc-dir-resynch-file): Expand FNAME as well,
since it can be abbreviated (as returned by vc-find-root).
Diffstat (limited to 'lisp/vc/vc-dir.el')
| -rw-r--r-- | lisp/vc/vc-dir.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index eb03a8b45a7..9b15e64fad7 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -932,7 +932,7 @@ If it is a file, return the corresponding cons for the file itself." (defun vc-dir-resynch-file (&optional fname) "Update the entries for FNAME in any directory buffers that list it." - (let ((file (or fname (expand-file-name buffer-file-name))) + (let ((file (expand-file-name (or fname buffer-file-name))) (drop '())) (save-current-buffer ;; look for a vc-dir buffer that might show this file. |