mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-30 08:09:04 +00:00
(env_vars): Put site-lisp before lisp in EMACSLOADPATH.
Quote group name. Allow different icons to be specified. (env_vars): No longer set INFOPATH.
This commit is contained in:
parent
7f470effe9
commit
9296c0e8d1
24
nt/addpm.c
24
nt/addpm.c
@ -54,12 +54,14 @@ static struct entry
|
||||
env_vars[] =
|
||||
{
|
||||
{"emacs_dir", NULL},
|
||||
{"EMACSLOADPATH", "%emacs_dir%/lisp;%emacs_dir%/site-lisp"},
|
||||
{"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/lisp"},
|
||||
{"SHELL", "%emacs_dir/bin/cmdproxy.exe%"},
|
||||
{"EMACSDATA", "%emacs_dir%/etc"},
|
||||
{"EMACSPATH", "%emacs_dir%/bin"},
|
||||
{"EMACSLOCKDIR", "%emacs_dir%/lock"},
|
||||
{"INFOPATH", "%emacs_dir%/info"},
|
||||
/* We no longer set INFOPATH because Info-default-directory-list
|
||||
is then ignored. */
|
||||
/* {"INFOPATH", "%emacs_dir%/info"}, */
|
||||
{"EMACSDOC", "%emacs_dir%/etc"},
|
||||
{"TERM", "cmd"}
|
||||
};
|
||||
@ -111,7 +113,7 @@ main (argc, argv)
|
||||
HSZ ProgMan;
|
||||
char modname[MAX_PATH];
|
||||
char additem[MAX_PATH*2 + 100];
|
||||
char *lpext;
|
||||
char *prog_name;
|
||||
char *emacs_path;
|
||||
char *p;
|
||||
|
||||
@ -160,19 +162,23 @@ main (argc, argv)
|
||||
}
|
||||
}
|
||||
|
||||
lpext = add_registry (emacs_path) ? "exe" : "bat";
|
||||
prog_name = add_registry (emacs_path) ? "runemacs.exe" : "emacs.bat";
|
||||
|
||||
DdeInitialize (&idDde, (PFNCALLBACK)DdeCallback, APPCMD_CLIENTONLY, 0);
|
||||
|
||||
ProgMan = DdeCreateStringHandle (idDde, "PROGMAN", CP_WINANSI);
|
||||
|
||||
if (HConversation = DdeConnect (idDde, ProgMan, ProgMan, NULL))
|
||||
HConversation = DdeConnect (idDde, ProgMan, ProgMan, NULL);
|
||||
if (HConversation != 0)
|
||||
{
|
||||
DdeCommand ("[CreateGroup (Gnu Emacs)]");
|
||||
DdeCommand ("[CreateGroup (\"Gnu Emacs\")]");
|
||||
DdeCommand ("[ReplaceItem (Emacs)]");
|
||||
sprintf (additem, "[AddItem (%s\\bin\\runemacs.%s, Emacs%c%s)]",
|
||||
emacs_path, lpext, (argc>2 ? ',' : ' '),
|
||||
(argc>2 ? argv[2] : ""));
|
||||
if (argc > 2)
|
||||
sprintf (additem, "[AddItem (\"%s\\bin\\%s\", Emacs, \"%s\")]",
|
||||
emacs_path, prog_name, argv[2]);
|
||||
else
|
||||
sprintf (additem, "[AddItem (\"%s\\bin\\%s\", Emacs)]",
|
||||
emacs_path, prog_name);
|
||||
DdeCommand (additem);
|
||||
|
||||
DdeDisconnect (HConversation);
|
||||
|
Loading…
Reference in New Issue
Block a user