(init_cmdargs): Make Vinvocation_directory

absolute if it isn't already.

diff --git a/src/emacs.c b/src/emacs.c
index 2f17c312b3b7d200b9e04316843d333ab881ea6b..5a8af21463fcb70955a8f5b7abaaa0cce96cf177 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -218,6 +218,11 @@ init_cmdargs (argc, argv, skip_args)
        Vinvocation_directory = Ffile_name_directory (found);
     }
 
+  if (!NILP (Vinvocation_directory)
+      && NILP (Ffile_name_absolute_p (Vinvocation_directory)))
+    /* Emacs was started with relative path, like ./emacs  */
+    Vinvocation_directory = Fexpand_file_name (Vinvocation_directory, Qnil);
+
   Vinstallation_directory = Qnil;
 
   if (!NILP (Vinvocation_directory))