---
magit.el | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/magit.el b/magit.el
index 6712ab4..8bf1b8d 100644
--- a/magit.el
+++ b/magit.el
@@ -3869,14 +3869,14 @@ With a non numeric prefix ARG, show all entries"
(let* ((section (get-text-property (point) 'magit-section))
(commit (and (member 'commit (magit-section-context-type section))
(magit-section-info section)))
- (old-editor (getenv "GIT_EDITOR")))
- (setenv "GIT_EDITOR" (expand-file-name "emacsclient" exec-directory))
+ (editor (concat "GIT_EDITOR="
+ (expand-file-name "emacsclient" exec-directory)))
+ (magit-env (cons editor magit-env)))
(unwind-protect
(magit-run-git-async "rebase" "-i"
(or (and commit (concat commit "^"))
- (read-string "Interactively rebase to: ")))
- (if old-editor
- (setenv "GIT_EDITOR" old-editor)))))
+ (magit-read-rev "Rebase interactively to"
+ (magit-default-rev)))))))
(defvar magit-show-branches-mode-map
(let ((map (make-sparse-keymap)))
--
1.6.3.3
