magit's interactive rebase feature tries to start the server even if
it is already running. If it is already running then Emacs asks
whether or not it should destroy existing clients. This is fatal if
the frame magit is running in was created by emacsclient
itself (e.g. Emacs is running in the background with "--daemon"), so
the user has to answer "no".
This question can be avoided if the server is only startet if it isn't
already running.
---
magit.el | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/magit.el b/magit.el
index ad8b122..9aef107 100644
--- a/magit.el
+++ b/magit.el
@@ -3545,7 +3545,8 @@ Prefix arg means justify as well."
(defun magit-interactive-rebase ()
"Start a git rebase -i session, old school-style."
(interactive)
- (server-start)
+ (unless (server-running-p)
+ (server-start))
(let* ((section (get-text-property (point) 'magit-section))
(commit (and (member 'commit (magit-section-context-type section))
(magit-section-info section)))
--
1.6.0.4
--
To unsubscribe, reply using "remove me" as the subject.
