Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

21 files changed, 22 insertions, 21 deletions

diff --git a/lisp/modules/indent.lsp b/lisp/modules/indent.lsp
index 4a7f7aa..44c923c 100644
--- a/lisp/modules/indent.lsp
+++ b/lisp/modules/indent.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/indent.lsp,v 1.7 2003/01/29 03:05:53 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/indent.lsp,v 1.6 2003/01/16 03:50:46 paulo Exp $
 ;;
 
 (provide "indent")
diff --git a/lisp/modules/lisp.lsp b/lisp/modules/lisp.lsp
index 55d5e6c..26a7ea8 100644
--- a/lisp/modules/lisp.lsp
+++ b/lisp/modules/lisp.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/lisp.lsp,v 1.10 2002/12/20 04:32:47 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/lisp.lsp,v 1.9 2002/12/04 05:28:01 paulo Exp $
 ;;
 (provide "lisp")
 
diff --git a/lisp/modules/progmodes/c.lsp b/lisp/modules/progmodes/c.lsp
index 1aba11a..609cf2b 100644
--- a/lisp/modules/progmodes/c.lsp
+++ b/lisp/modules/progmodes/c.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/c.lsp,v 1.28 2004/02/04 20:49:08 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/c.lsp,v 1.27 2004/01/12 17:53:20 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/html.lsp b/lisp/modules/progmodes/html.lsp
index 86f8eea..ee8da50 100644
--- a/lisp/modules/progmodes/html.lsp
+++ b/lisp/modules/progmodes/html.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/html.lsp,v 1.3 2002/10/06 17:11:48 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/html.lsp,v 1.2 2002/09/22 18:41:27 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/imake.lsp b/lisp/modules/progmodes/imake.lsp
index e41020b..e3be141 100644
--- a/lisp/modules/progmodes/imake.lsp
+++ b/lisp/modules/progmodes/imake.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/imake.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/imake.lsp,v 1.2 2002/10/06 17:11:48 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/lisp.lsp b/lisp/modules/progmodes/lisp.lsp
index a6ca6d2..a3dbb3c 100644
--- a/lisp/modules/progmodes/lisp.lsp
+++ b/lisp/modules/progmodes/lisp.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/lisp.lsp,v 1.10 2004/01/08 21:29:12 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/lisp.lsp,v 1.9 2003/01/30 02:46:26 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/make.lsp b/lisp/modules/progmodes/make.lsp
index 702e135..1719c35 100644
--- a/lisp/modules/progmodes/make.lsp
+++ b/lisp/modules/progmodes/make.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/make.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/make.lsp,v 1.2 2002/10/06 17:11:48 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/man.lsp b/lisp/modules/progmodes/man.lsp
index 7f64653..8eddb99 100644
--- a/lisp/modules/progmodes/man.lsp
+++ b/lisp/modules/progmodes/man.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/man.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/man.lsp,v 1.2 2002/10/06 17:11:48 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/patch.lsp b/lisp/modules/progmodes/patch.lsp
index 4d4d8e3..cb87276 100644
--- a/lisp/modules/progmodes/patch.lsp
+++ b/lisp/modules/progmodes/patch.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/patch.lsp,v 1.1 2003/12/11 16:03:31 paulo Exp $
+;; $XFree86$
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/rpm.lsp b/lisp/modules/progmodes/rpm.lsp
index 3a524b7..b111974 100644
--- a/lisp/modules/progmodes/rpm.lsp
+++ b/lisp/modules/progmodes/rpm.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/rpm.lsp,v 1.2 2004/01/08 21:29:12 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/rpm.lsp,v 1.1 2003/01/16 03:50:46 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/sgml.lsp b/lisp/modules/progmodes/sgml.lsp
index 66e6ae2..bcffb6b 100644
--- a/lisp/modules/progmodes/sgml.lsp
+++ b/lisp/modules/progmodes/sgml.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/sgml.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/sgml.lsp,v 1.2 2002/10/06 17:11:48 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/sh.lsp b/lisp/modules/progmodes/sh.lsp
index 120f244..49fa36c 100644
--- a/lisp/modules/progmodes/sh.lsp
+++ b/lisp/modules/progmodes/sh.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/sh.lsp,v 1.2 2004/01/08 21:29:13 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/sh.lsp,v 1.1 2003/01/16 03:50:46 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/xconf.lsp b/lisp/modules/progmodes/xconf.lsp
index dea70a2..3353a2d 100644
--- a/lisp/modules/progmodes/xconf.lsp
+++ b/lisp/modules/progmodes/xconf.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/xconf.lsp,v 1.1 2003/01/16 03:50:46 paulo Exp $
+;; $XFree86$
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/xlog.lsp b/lisp/modules/progmodes/xlog.lsp
index 8628dd3..d4c12ca 100644
--- a/lisp/modules/progmodes/xlog.lsp
+++ b/lisp/modules/progmodes/xlog.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/xlog.lsp,v 1.2 2004/01/08 21:29:13 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/xlog.lsp,v 1.1 2003/01/16 06:25:51 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/progmodes/xrdb.lsp b/lisp/modules/progmodes/xrdb.lsp
index b6ee71a..29a5c27 100644
--- a/lisp/modules/progmodes/xrdb.lsp
+++ b/lisp/modules/progmodes/xrdb.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/xrdb.lsp,v 1.3 2004/01/08 21:29:13 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/xrdb.lsp,v 1.2 2002/10/06 17:11:48 paulo Exp $
 ;;
 
 (require "syntax")
diff --git a/lisp/modules/psql.c b/lisp/modules/psql.c
index fc112fc..25c425e 100644
--- a/lisp/modules/psql.c
+++ b/lisp/modules/psql.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/modules/psql.c,v 1.13 2003/04/27 18:17:37 tsi Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/psql.c,v 1.12tsi Exp $ */
 
 #include <stdlib.h>
 #include <libpq-fe.h>
diff --git a/lisp/modules/syntax.lsp b/lisp/modules/syntax.lsp
index 835e41d..012ba19 100644
--- a/lisp/modules/syntax.lsp
+++ b/lisp/modules/syntax.lsp
@@ -27,7 +27,7 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/syntax.lsp,v 1.12 2004/01/08 21:29:11 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/syntax.lsp,v 1.11 2003/01/16 03:50:46 paulo Exp $
 ;;
 
 (provide "syntax")
diff --git a/lisp/modules/x11.c b/lisp/modules/x11.c
index 2383e4e..1b976fd 100644
--- a/lisp/modules/x11.c
+++ b/lisp/modules/x11.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/modules/x11.c,v 1.12 2003/04/27 18:17:37 tsi Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/x11.c,v 1.11tsi Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lisp/modules/xaw.c b/lisp/modules/xaw.c
index 4e6bdf4..82c0dc8 100644
--- a/lisp/modules/xaw.c
+++ b/lisp/modules/xaw.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/modules/xaw.c,v 1.16 2003/04/27 18:17:37 tsi Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/xaw.c,v 1.15tsi Exp $ */
 
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
diff --git a/lisp/modules/xedit.lsp b/lisp/modules/xedit.lsp
index f59517e..fc6a9b4 100644
--- a/lisp/modules/xedit.lsp
+++ b/lisp/modules/xedit.lsp
@@ -27,7 +27,8 @@
 ;; Author: Paulo César Pereira de Andrade
 ;;
 ;;
-;; $XFree86: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.11 2003/12/11 16:03:30 paulo Exp $
+;; $XdotOrg: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.11 2003/12/11 16:03:30 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/xedit.lsp,v 1.9 2003/01/16 03:50:46 paulo Exp $
 ;;
 
 (provide "xedit")
diff --git a/lisp/modules/xt.c b/lisp/modules/xt.c
index 83487b9..4e89e89 100644
--- a/lisp/modules/xt.c
+++ b/lisp/modules/xt.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/modules/xt.c,v 1.21 2003/04/27 18:17:38 tsi Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/xt.c,v 1.20tsi Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>