The unified diff between revisions [3099ff90..] and [e9aa88ea..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'std_hooks.lua'

#
#
# patch "std_hooks.lua"
#  from [a2a27daced7769d54850f059f39554cb1e0fc78d]
#    to [956a176b43d8425910623c605d405c2678676e55]
#
============================================================
--- std_hooks.lua	a2a27daced7769d54850f059f39554cb1e0fc78d
+++ std_hooks.lua	956a176b43d8425910623c605d405c2678676e55
@@ -337,18 +337,17 @@ function merge2_emacs_cmd(emacs, lfile,
    local elisp = "(ediff-merge-files \"%s\" \"%s\" nil \"%s\")"
    return
    function()
-      return execute(emacs, "-eval",
+      return execute(emacs, "--eval",
                      string.format(elisp, lfile, rfile, outfile))
    end
 end

 function merge3_emacs_cmd(emacs, lfile, afile, rfile, outfile)
    local elisp = "(ediff-merge-files-with-ancestor \"%s\" \"%s\" \"%s\" nil \"%s\")"
-   local cmd_fmt = "%s -eval " .. elisp
    return
    function()
-      execute(emacs, "-eval",
-              string.format(elisp, lfile, rfile, afile, outfile))
+      return execute(emacs, "--eval",
+                     string.format(elisp, lfile, rfile, afile, outfile))
    end
 end