XEmacs 21.2.20 "Yoko".

diff --git a/lib-src/run.c b/lib-src/run.c
index 86830ba..b808c4a 100644 (file)
--- a/lib-src/run.c
+++ b/lib-src/run.c
@@ -65,10 +65,14 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
    char execpath[MAX_PATH];
    char* argv[MAX_ARGS+1]; /* leave extra slot for compact_invocation argv[0] */
    int argc;
-   int i,j;
+   int i;
    char exec[MAX_PATH + FILENAME_MAX + 100];
    char cmdline2[MAX_ARGS * MAX_PATH];
 
+#ifdef Debug
+   int j;
+#endif
+
    compact_invocation = get_exec_name_and_path(execname,execpath);
 
    if (compact_invocation)
@@ -157,7 +161,9 @@ void xemacs_special(char* exec)
    char* p;
    char* p2;
    char exec2[MAX_PATH + FILENAME_MAX + 100];
+#if defined(__CYGWIN__)
    char tmp[MAX_PATH + FILENAME_MAX + 100];
+#endif
    strcpy(exec2,exec);
    /* this depends on short-circuit evaluation */
    if ( ((p = strrchr(exec2,'\\')) && stricmp(p,"\\xemacs") == 0) ||

diff --git a/lisp/winnt.el b/lisp/winnt.el
index 9ce0750..0dedb06 100644 (file)
--- a/lisp/winnt.el
+++ b/lisp/winnt.el
@@ -39,11 +39,14 @@
 ;; #### Oh if we had an alist of shells and their command switches.
 (setq shell-command-switch "/c")
 
-;; For appending suffixes to directories and files in shell completions.
-(defun nt-shell-mode-hook ()
-  (setq comint-completion-addsuffix '("\\" . " ")
-       comint-process-echoes t))
-(add-hook 'shell-mode-hook 'nt-shell-mode-hook)
+;; For appending suffixes to directories and files in shell
+;; completions.  This screws up cygwin users so we leave it out for
+;; now. Uncomment this if you only ever want to use cmd.
+
+;(defun nt-shell-mode-hook ()
+;  (setq comint-completion-addsuffix '("\\" . " ")
+;      comint-process-echoes t))
+;(add-hook 'shell-mode-hook 'nt-shell-mode-hook)
 
 ;; Use ";" instead of ":" as a path separator (from files.el).
 (setq path-separator ";")