--- a/mercurial/commands.py	Thu May 11 14:32:09 2006 -0700
+++ b/mercurial/commands.py	Thu May 11 14:41:52 2006 -0700
@@ -789,7 +789,7 @@
     commit_opts['addremove'] = False
     if not commit_opts['message'] and not commit_opts['logfile']:
         commit_opts['message'] = _("Backed out changeset %s") % (hex(node))
-        commit_opts['force_editor'] = True;
+        commit_opts['force_editor'] = True
     commit(ui, repo, **commit_opts)
     def nice(node):
         return '%d:%s' % (repo.changelog.rev(node), short(node))
@@ -988,12 +988,8 @@
     else:
         files = []
     try:
-        try:
-            force_editor = opts['force_editor']
-        except KeyError:
-            force_editor = False
         repo.commit(files, message, opts['user'], opts['date'], match,
-            force_editor=force_editor)
+                    force_editor=opts.get('force_editor'))
     except ValueError, inst:
         raise util.Abort(str(inst))