diff options
| author | Juri Linkov | 2018-12-04 02:15:37 +0200 |
|---|---|---|
| committer | Juri Linkov | 2018-12-04 02:15:37 +0200 |
| commit | df5614297b6d4ca8a3c9cd18fea5088401b25146 (patch) | |
| tree | 19811a89f81d31f90f08bb0a4fb0b68f1ebc4941 | |
| parent | bc6ffabe803f63e99cfbeab79aa0dbdf77f756cb (diff) | |
| download | emacs-df5614297b6d4ca8a3c9cd18fea5088401b25146.tar.gz emacs-df5614297b6d4ca8a3c9cd18fea5088401b25146.zip | |
* lisp/vc/vc-git.el (vc-git-stash): Call vc-dir-marked-files only
in vc-dir-mode.
| -rw-r--r-- | lisp/vc/vc-git.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index e406660d2fd..f3174005307 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -1475,12 +1475,16 @@ This command shares argument histories with \\[rgrep] and \\[grep]." | |||
| 1475 | (if (eq next-error-last-buffer (current-buffer)) | 1475 | (if (eq next-error-last-buffer (current-buffer)) |
| 1476 | (setq default-directory dir)))))) | 1476 | (setq default-directory dir)))))) |
| 1477 | 1477 | ||
| 1478 | (autoload 'vc-dir-marked-files "vc-dir") | ||
| 1479 | |||
| 1478 | (defun vc-git-stash (name) | 1480 | (defun vc-git-stash (name) |
| 1479 | "Create a stash." | 1481 | "Create a stash." |
| 1480 | (interactive "sStash name: ") | 1482 | (interactive "sStash name: ") |
| 1481 | (let ((root (vc-git-root default-directory))) | 1483 | (let ((root (vc-git-root default-directory))) |
| 1482 | (when root | 1484 | (when root |
| 1483 | (apply #'vc-git--call nil "stash" "push" "-m" name (vc-dir-marked-files)) | 1485 | (apply #'vc-git--call nil "stash" "push" "-m" name |
| 1486 | (when (derived-mode-p 'vc-dir-mode) | ||
| 1487 | (vc-dir-marked-files))) | ||
| 1484 | (vc-resynch-buffer root t t)))) | 1488 | (vc-resynch-buffer root t t)))) |
| 1485 | 1489 | ||
| 1486 | (defvar vc-git-stash-read-history nil | 1490 | (defvar vc-git-stash-read-history nil |