mercurial/commands.py

--- a/mercurial/commands.py	Sun May 11 00:49:35 2014 +0900
+++ b/mercurial/commands.py	Sun May 11 00:49:36 2014 +0900
@@ -488,11 +488,11 @@
 
 
         def commitfunc(ui, repo, message, match, opts):
-            e = cmdutil.commiteditor
+            e = cmdutil.getcommiteditor()
             if not message:
                 # we don't translate commit messages
                 message = "Backed out changeset %s" % short(node)
-                e = cmdutil.commitforceeditor
+                e = cmdutil.getcommiteditor(edit=True)
             return repo.commit(message, opts.get('user'), opts.get('date'),
                                match, editor=e)
         newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)