# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 871335848 0
# Node ID 812986c77ae29afbdd771bd7575a041b0cd895c3
# Parent  1f8ca0c4836fbf34588e7e796307d7a0aff20d20
(init_environment): Set Emacs root directory properly when
the executable is in its `src' subdirectory, as under a debugger.
(IT_set_face): If termscript is in use, print the number of the
face as well.

diff -r 1f8ca0c4836f -r 812986c77ae2 src/msdos.c
--- a/src/msdos.c	Mon Aug 11 21:42:39 1997 +0000
+++ b/src/msdos.c	Mon Aug 11 21:44:08 1997 +0000
@@ -591,7 +591,8 @@
   else
     fp = intern_face (selected_frame, FRAME_COMPUTED_FACES (foo)[face]);
   if (termscript)
-    fprintf (termscript, "<FACE:%d:%d>", FACE_FOREGROUND (fp), FACE_BACKGROUND (fp));
+    fprintf (termscript, "<FACE %d: %d/%d>",
+	     face, FACE_FOREGROUND (fp), FACE_BACKGROUND (fp));
   screen_face = face;
   ScreenAttrib = (FACE_BACKGROUND (fp) << 4) | FACE_FOREGROUND (fp);
 }
@@ -2708,10 +2709,12 @@
   while (len > 0 && root[len] != '/' && root[len] != ':')
     len--;
   root[len] = '\0';
-  if (len > 4 && strcmp (root + len - 4, "/bin") == 0)
+  if (len > 4
+      && (strcmp (root + len - 4, "/bin") == 0
+	  || strcmp (root + len - 4, "/src") == 0)) /* under a debugger */
     root[len - 4] = '\0';
   else
-    strcpy (root, "c:/emacs");  /* Only under debuggers, I think.  */
+    strcpy (root, "c:/emacs");  /* let's be defensive */
   len = strlen (root);
   strcpy (emacsroot, root);