1 files changed, 8 insertions, 3 deletions
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 1488939..45aca1b 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -433,11 +433,16 @@ if ($spewDiff && @changed_files) {
 # Open ChangeLogs.
 if ($openChangeLogs && @logs) {
     print STDERR "  Opening the edited ChangeLog files.\n";
-    my $editor = $ENV{"CHANGE_LOG_EDIT_APPLICATION"};
+    my $editor = $ENV{CHANGE_LOG_EDITOR};
     if ($editor) {
-        system "open", "-a", $editor, @logs;
+        system ((split ' ', $editor), @logs);
     } else {
-        system "open", "-e", @logs;
+        $editor = $ENV{CHANGE_LOG_EDIT_APPLICATION};
+        if ($editor) {
+            system "open", "-a", $editor, @logs;
+        } else {
+            system "open", "-e", @logs;
+        }
     }
 }