Merge pull request #1505 from birdgg/fix-smergehydra

emacs/vc: fix file-not-found in autoload
This commit is contained in:
Henrik Lissner 2019-06-22 02:01:38 +02:00 committed by GitHub
commit 2d5e72baeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,7 +41,7 @@ info in the `header-line-format' is a good indication."
(propertize sha-or-subject 'face 'git-timemachine-minibuffer-detail-face)
date-full date-relative))))
;;;###autoload (autoload '+vc-smerge-hydra/body "emacs/vc/autoload" nil t)
;;;###autoload (autoload '+vc-smerge-hydra/body "emacs/vc/autoload/vc" nil t)
(defhydra +vc-smerge-hydra (:hint nil
:pre (if (not smerge-mode) (smerge-mode 1))
;; Disable `smerge-mode' when quitting hydra if