branch: elpa/magit
commit 89c12a1a8cde4fa9189968dc1512f1f97fe550b1
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
ediff: Use magit-get-revision-buffer for index blobs
---
lisp/magit-ediff.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index 44a30a91e1..3d292b76cc 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -503,9 +503,9 @@ FILE must be relative to the top directory of the
repository."
(magit-staged-files)
"No staged files")))
(magit-ediff-buffers ((magit-get-revision-buffer "HEAD" file)
- (magit-ediff--find-file "HEAD" file))
- ((get-buffer (concat file ".~{index}~"))
- (magit-ediff--find-file "{index}" file))))
+ (magit-ediff--find-file "HEAD" file))
+ ((magit-get-revision-buffer "{index}" file)
+ (magit-ediff--find-file "{index}" file))))
;;;###autoload
(defun magit-ediff-show-unstaged (file)
@@ -519,8 +519,8 @@ FILE must be relative to the top directory of the
repository."
(list (magit-read-file-choice "Show unstaged changes for file"
(magit-unstaged-files)
"No unstaged files")))
- (magit-ediff-buffers ((get-buffer (concat file ".~{index}~"))
- (magit-ediff--find-file "{index}" file))
+ (magit-ediff-buffers ((magit-get-revision-buffer "{index}" file)
+ (magit-ediff--find-file "{index}" file))
((get-file-buffer file)
(find-file-noselect file))))
@@ -533,7 +533,7 @@ FILE must be relative to the top directory of the
repository."
(magit-changed-files "HEAD")
"No changed files")))
(magit-ediff-buffers ((magit-get-revision-buffer "HEAD" file)
- (magit-ediff--find-file "HEAD" file))
+ (magit-ediff--find-file "HEAD" file))
((get-file-buffer file)
(find-file-noselect file))))
