Mercurial > emacs
changeset 31084:2f7db3489395
(main): Accept /q to mean install based on addpm's
location without asking. Remove reference to emacs.bat which is
now obsolete.
author | Andrew Innes <andrewi@gnu.org> |
---|---|
date | Tue, 22 Aug 2000 21:43:12 +0000 |
parents | f64a9a44e2a3 |
children | ab2cd9e121f1 |
files | nt/addpm.c |
diffstat | 1 files changed, 24 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/nt/addpm.c Tue Aug 22 21:41:26 2000 +0000 +++ b/nt/addpm.c Tue Aug 22 21:43:12 2000 +0000 @@ -116,16 +116,24 @@ char *prog_name; char *emacs_path; char *p; + int quiet = 0; /* If no args specified, use our location to set emacs_path. */ #if 0 if (argc < 2 || argc > 3) { - fprintf (stderr, "usage: addpm emacs_path [icon_path]\n"); + fprintf (stderr, "usage: addpm [/q] [emacs_path [icon_path]]\n"); exit (1); } #endif + if (argc > 1 && argv[1][0] == '/' && argv[1][1] == 'q') + { + quiet = 1; + --argc; + ++argv; + } + if (argc > 1) emacs_path = argv[1]; else @@ -151,21 +159,24 @@ } /* Tell user what we are going to do. */ - { - int result; + if (!quiet) + { + int result; - char msg[ MAX_PATH ]; - sprintf (msg, "Install Emacs at %s?\n", emacs_path); - result = MessageBox (NULL, msg, "Install Emacs", MB_OKCANCEL | MB_ICONQUESTION); - if (result != IDOK) - { - fprintf (stderr, "Install cancelled\n"); - exit (1); - } - } + char msg[ MAX_PATH ]; + sprintf (msg, "Install Emacs at %s?\n", emacs_path); + result = MessageBox (NULL, msg, "Install Emacs", + MB_OKCANCEL | MB_ICONQUESTION); + if (result != IDOK) + { + fprintf (stderr, "Install cancelled\n"); + exit (1); + } + } } - prog_name = add_registry (emacs_path) ? "runemacs.exe" : "emacs.bat"; + add_registry (emacs_path); + prog_name = "runemacs.exe"; DdeInitialize (&idDde, (PFNCALLBACK)DdeCallback, APPCMD_CLIENTONLY, 0);