From 513fe25a501b41f9f2aac67f73c8e8730aed81b0 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Tue, 20 Oct 2015 20:04:47 +0300 Subject: [PATCH] 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). --- lisp/vc/vc-dir.el | 2 +- lisp/vc/vc-git.el | 8 ++++++-- 2 files changed, 7 insertions(+), 3 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. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 2a8cd568bf7..0e33896a715 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1362,11 +1362,15 @@ This command shares argument histories with \\[rgrep] and \\[grep]." (defun vc-git-stash-apply-at-point () (interactive) - (vc-git-stash-apply (format "stash@%s" (vc-git-stash-get-at-point (point))))) + (let (vc-dir-buffers) ; Small optimization. + (vc-git-stash-apply (format "stash@%s" (vc-git-stash-get-at-point (point))))) + (vc-dir-refresh)) (defun vc-git-stash-pop-at-point () (interactive) - (vc-git-stash-pop (format "stash@%s" (vc-git-stash-get-at-point (point))))) + (let (vc-dir-buffers) ; Likewise. + (vc-git-stash-pop (format "stash@%s" (vc-git-stash-get-at-point (point))))) + (vc-dir-refresh)) (defun vc-git-stash-menu (e) (interactive "e") -- 2.39.2