{"thread":{"id":"9199","subject":"[PATCH] git.el: Pass an explicit argument to enable smerge-mode.","startedAt":"2007-07-24T10:02:28Z","lastAt":"2007-07-24T10:02:28Z","messageCount":1,"participants":["Alexandre Julliard"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"48430","messageId":"87wswqktl7.fsf@wine.dyndns.org","threadId":"9199","inReplyTo":null,"subject":"[PATCH] git.el: Pass an explicit argument to enable smerge-mode.","fromName":"Alexandre Julliard","fromEmail":"julliard@winehq.org","sentAt":"2007-07-24T10:02:28Z","receivedAt":"2007-07-24T10:02:28Z","isPatch":true,"sender":{"key":"julliard@winehq.org","avatar":null},"body":"Without argument the mode is toggled, which would do the wrong thing\nif the file was already open.\n\nSigned-off-by: Alexandre Julliard <julliard@winehq.org>\n---\n contrib/emacs/git.el |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 457f95f..d7f4316 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -1038,7 +1038,7 @@ and returns the process output as a string.\"\n   (let ((info (ewoc-data (ewoc-locate git-status))))\n     (find-file (git-fileinfo->name info))\n     (when (eq 'unmerged (git-fileinfo->state info))\n-      (smerge-mode))))\n+      (smerge-mode 1))))\n \n (defun git-find-file-other-window ()\n   \"Visit the current file in its own buffer in another window.\"\n-- \n1.5.3.rc2.39.g82303f\n\n-- \nAlexandre Julliard\njulliard@winehq.org\n"}]}