? external/xwem-minilaunch
? external/xwem-minitime
? xlib/xlib-autoloads.el
? xwem/semantic.cache
Index: external/Makefile
===================================================================
RCS file: /cvsroot/xwem/xwem/external/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- external/Makefile	28 Nov 2003 09:37:01 -0000	1.1
+++ external/Makefile	17 Jun 2004 18:43:07 -0000
@@ -1,6 +1,7 @@
 CC=gcc
 
-PROGS=xwem-miniapm xwem-minilaunch xwem-minitime #xwem-minimon
+#PROGS=xwem-miniapm xwem-minilaunch xwem-minitime #xwem-minimon
+PROGS=xwem-minilaunch xwem-minitime #xwem-minimon
 EXOBJS=tray.o
 
 CFLAGS=-Wall -pipe -g
Index: external/xwem-miniapm.c
===================================================================
RCS file: /cvsroot/xwem/xwem/external/xwem-miniapm.c,v
retrieving revision 1.1
diff -u -r1.1 xwem-miniapm.c
--- external/xwem-miniapm.c	28 Nov 2003 09:37:01 -0000	1.1
+++ external/xwem-miniapm.c	17 Jun 2004 18:43:07 -0000
@@ -24,7 +24,7 @@
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#include <machine/apm_bios.h>
+#include <linux/apm_bios.h>
 
 #include <err.h>
  
Index: xwem/xwem-launcher.el
===================================================================
RCS file: /cvsroot/xwem/xwem/xwem/xwem-launcher.el,v
retrieving revision 1.3
diff -u -r1.3 xwem-launcher.el
--- xwem/xwem-launcher.el	15 Feb 2004 12:34:37 -0000	1.3
+++ xwem/xwem-launcher.el	17 Jun 2004 18:43:07 -0000
@@ -230,6 +230,7 @@
 	 (prg (car cmdargs))
 	 (args (cdr cmdargs))
 	 (job-number 1)
+         (emacs-env (getenv "EMACS"))
 	 job-name)
     (while (get-process (setq job-name (format "xwem-run-%d" job-number)))
       (setq job-number (1+ job-number)))
@@ -243,6 +244,13 @@
       (insert "--- working directory: " default-directory
 	      "\n% " command ?\n)
 
+      ;; Set our EMACS environment variable so comint-exec doesn't do it
+      ;; for us.  Note that if the environment is already set, we may
+      ;; not want to do it again.
+      (if emacs-env
+          nil
+        (setenv "EMACS" "xwem"))
+      
       (let ((proc (get-buffer-process
 		   (comint-exec buffer-name job-name prg nil args))))
 	(comint-mode)
@@ -250,6 +258,10 @@
 	(cond (proc (set-process-sentinel proc 'xwem-program-sentinel)
 		    (message "[%d] %d" job-number (process-id proc))))
 	(setq mode-name "XWEM-Run")
+
+        ;; Restore our Emacs environment variable to its previous state.
+        (setenv "EMACS" emacs-env)
+        
 	proc))))
 
 (defun xwem-program-sentinel (process msg)