# 
# patch "ChangeLog"
#  from [017165ff2102237ffbd47b966d93232e8ba70cf4]
#    to [d27f7ed944737df5662a43778aa7ae57949e76f3]
# 
# patch "std_hooks.lua"
#  from [e3b18c1cbca5bc0e1b47151cb273f6c335c81abe]
#    to [956a176b43d8425910623c605d405c2678676e55]
# 
========================================================================
--- ChangeLog	017165ff2102237ffbd47b966d93232e8ba70cf4
+++ ChangeLog	d27f7ed944737df5662a43778aa7ae57949e76f3
@@ -1,5 +1,6 @@
 2005-10-06  Matthew Gregan  <address@hidden>
 
+	* std_hooks.lua (merge3_emacs_cmd): Minor cleanup.
 	* std_hooks.lua: Pass '--eval' rather than '-eval' to Emacs; the
 	CVS emacsclient does not consider '-eval' as valid.
 	* platform.hh, unix/fs.cc, win32/fs.cc (rename_clobberingly): New
@@ -12246,3 +12247,4 @@
 2003-04-06  graydon hoare  <address@hidden>
 
 	* initial release.
+
========================================================================
--- std_hooks.lua	e3b18c1cbca5bc0e1b47151cb273f6c335c81abe
+++ std_hooks.lua	956a176b43d8425910623c605d405c2678676e55
@@ -344,11 +344,10 @@
 
 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