#
# patch "ChangeLog"
#  from [36b9f1266eed5234397ca7625dc90ab1860d656e]
#    to [b67b684cabbc643e60ae3f73c3c001bc095f4094]
#
# patch "std_hooks.lua"
#  from [1cc11534ca3c3a7c0411de4c5cc3346f33382569]
#    to [3aa6ea33c6bbb6e43c63dd4ff8ed353f3b9d4ce3]
#
========================================================================
--- ChangeLog	36b9f1266eed5234397ca7625dc90ab1860d656e
+++ ChangeLog	b67b684cabbc643e60ae3f73c3c001bc095f4094
@@ -1,3 +1,7 @@
+2005-09-07  Benoît Dejean  <address@hidden>
+
+	* std_hooks.lua: Don't spawn emacs with '-no-init-file'.
+
 2005-09-09  Matthew Gregan  <address@hidden>

 	* paths.cc (save_initial_path): Default Boost's fs::path to
========================================================================
--- std_hooks.lua	1cc11534ca3c3a7c0411de4c5cc3346f33382569
+++ std_hooks.lua	3aa6ea33c6bbb6e43c63dd4ff8ed353f3b9d4ce3
@@ -336,17 +336,17 @@
    local elisp = "(ediff-merge-files \"%s\" \"%s\" nil \"%s\")"
    return
    function()
-      return execute(emacs, "-no-init-file", "-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 -no-init-file -eval " .. elisp
+   local cmd_fmt = "%s -eval " .. elisp
    return
    function()
-      execute(emacs, "-no-init-file", "-eval",
+      execute(emacs, "-eval",
               string.format(elisp, lfile, rfile, afile, outfile))
    end
 end