Skip to content
Browse files

Merge branch 'mainline-maint' into mainline-master

  • Loading branch information...
2 parents f1f800b + a13ecc8 commit ae743c94fce62b3591dce514d4df554b30ecc1f6 @vanicat vanicat committed Oct 14, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 magit.el
View
4 magit.el
@@ -5587,8 +5587,8 @@ Return values:
(commit (and (member 'commit (magit-section-context-type section))
(magit-section-info section)))
(old-editor (getenv "GIT_EDITOR")))
- (if (locate-file "emacsclient" exec-path)
- (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
+ (if (executable-find "emacsclient")
+ (setenv "GIT_EDITOR" (concat (executable-find "emacsclient")
" -s " server-name))
(message "Cannot find emacsclient, using default git editor, please check you PATH"))
(unwind-protect

0 comments on commit ae743c9

Please sign in to comment.
Something went wrong with that request. Please try again.