From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 24 Jul 2007 10:02:28 +0000 (+0200)
Subject: git.el: Pass an explicit argument to enable smerge-mode.
X-Git-Tag: v1.5.3-rc3~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ceefa44fe2d72f73548c4c36b42916b9c60ae16b;p=git.git

git.el: Pass an explicit argument to enable smerge-mode.

Without argument the mode is toggled, which would do the wrong thing
if the file was already open.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index b92bbe872..53dd70326 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -1058,7 +1058,7 @@ Return the list of files that haven't been handled."
   (let ((info (ewoc-data (ewoc-locate git-status))))
     (find-file (git-fileinfo->name info))
     (when (eq 'unmerged (git-fileinfo->state info))
-      (smerge-mode))))
+      (smerge-mode 1))))
 
 (defun git-find-file-other-window ()
   "Visit the current file in its own buffer in another window."