summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-05-17 12:35:23 +0300
committerEli Zaretskii <eliz@gnu.org>2013-05-17 12:35:23 +0300
commit3e2af3481e94276340f7c00f1c8275bc323f6910 (patch)
treebfc95973b3f751e6a9d2d9c150a99079e586cc07 /nt
parent721c9e8a682721c6010c4c685764cd2359baf46b (diff)
downloademacs-3e2af3481e94276340f7c00f1c8275bc323f6910.tar.gz
Support invocation of un-installed runemacs.exe.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/runemacs.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index ebda94e80f3..696d320c8bc 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-17 Eli Zaretskii <eliz@gnu.org>
+
+ * runemacs.c (WinMain): Support invocation of un-installed
+ nt/runemacs.exe, by looking for src/emacs.exe.
+
2013-05-16 Eli Zaretskii <eliz@gnu.org>
* inc/stdint.h (SIZE_MAX) [!__GNUC__]: Define. (Bug#14409)
diff --git a/nt/runemacs.c b/nt/runemacs.c
index b090ffdd639..fd1524a9c41 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -75,6 +75,11 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
/* Quote executable name in case of spaces in the path. */
*new_cmdline = '"';
strcpy (new_cmdline + 1, modname);
+ /* Detect and handle un-installed runemacs.exe in nt/ subdirectory,
+ while emacs.exe is in src/. */
+ if ((p = strrchr (new_cmdline, '\\')) != NULL
+ && stricmp (p, "\\nt") == 0)
+ strcpy (p, "\\src");
#ifdef CHOOSE_NEWEST_EXE
{