Permalink
Browse files

Merge branch 'mainline-maint' into mainline-master

  • Loading branch information...
2 parents 47b4632 + dc482c5 commit ed2164c316ecbc9c7ecb6b4cd300f610e6fa552b @vanicat vanicat committed Oct 6, 2012
Showing with 114 additions and 63 deletions.
  1. +5 −3 magit.el
  2. +109 −60 magit.texi
View
@@ -30,7 +30,7 @@
;; Copyright (C) 2009 René Stadler.
;; Copyright (C) 2010 Robin Green.
;; Copyright (C) 2010 Roger Crew.
-;; Copyright (C) 2009, 2010, 2011 Rémi Vanicat.
+;; Copyright (C) 2009, 2010, 2011, 2012 Rémi Vanicat.
;; Copyright (C) 2010 Sean Bryant.
;; Copyright (C) 2009, 2011 Steve Purcell.
;; Copyright (C) 2010 Timo Juhani Lindfors.
@@ -5587,8 +5587,10 @@ Return values:
(commit (and (member 'commit (magit-section-context-type section))
(magit-section-info section)))
(old-editor (getenv "GIT_EDITOR")))
- (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
- " -s " server-name))
+ (if (locate-file "emacsclient" exec-path)
+ (setenv "GIT_EDITOR" (concat (locate-file "emacsclient" exec-path)
+ " -s " server-name))
+ (message "Cannot find emacsclient, using default git editor, please check you PATH"))
(unwind-protect
(magit-run-git-async "rebase" "-i"
(or (and commit (concat commit "^"))
Oops, something went wrong.

0 comments on commit ed2164c

Please sign in to comment.