3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE

2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).

11 files changed, 52 insertions, 54 deletions

diff --git a/lisp/modules/progmodes/c.lsp b/lisp/modules/progmodes/c.lsp
index bc4474b..1aba11a 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.26 2003/01/29 03:05:54 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/c.lsp,v 1.28 2004/02/04 20:49:08 paulo Exp $
 ;;
 
 (require "syntax")
@@ -36,7 +36,7 @@
 
 (defsynprop *prop-format*
     "format"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"RoyalBlue2"
     :underline	t
 )
@@ -490,8 +490,6 @@
     (indreduce :while
 	t
 	((:c-while :parens)
-	 ;; Assume that it is yet being edited, or adjusting indentation
-	(:c-while)
 	)
 	(incf c-complex)
     )
diff --git a/lisp/modules/progmodes/imake.lsp b/lisp/modules/progmodes/imake.lsp
index ea34ed6..e41020b 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.2 2002/10/06 17:11:48 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/imake.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
 ;;
 
 (require "syntax")
@@ -35,13 +35,13 @@
 
 (defsynprop *prop-shell*
     "shell"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"Red4"
 )
 
 (defsynprop *prop-variable*
     "variable"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :foreground	"Red3"
 )
 
@@ -49,13 +49,13 @@
 ;; tabs in the start of lines for better visualization.
 (defsynprop *prop-tabulation*
     "tabulation"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :background	"Gray90"
 )
 
 (defsynprop *prop-xcomm*
     "xcomm"
-    :font	"*courier-medium-o*12*"
+    :font	"*courier-medium-o*-12-*"
     :foreground	"SkyBlue4"
 )
 
diff --git a/lisp/modules/progmodes/lisp.lsp b/lisp/modules/progmodes/lisp.lsp
index ebf2c10..a6ca6d2 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.9 2003/01/30 02:46:26 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/lisp.lsp,v 1.10 2004/01/08 21:29:12 paulo Exp $
 ;;
 
 (require "syntax")
@@ -36,25 +36,25 @@
 
 (defsynprop *prop-special*
   "special"
-  :font		"*courier-bold-r*12*"
+  :font		"*courier-bold-r*-12-*"
   :foreground	"NavyBlue"
 )
 
 (defsynprop *prop-quote*
   "quote"
-  :font		"*courier-bold-r*12*"
+  :font		"*courier-bold-r*-12-*"
   :foreground	"Red3"
 )
 
 (defsynprop *prop-package*
   "package"
-  :font		"*lucidatypewriter-medium-r*12*"
+  :font		"*lucidatypewriter-medium-r*-12-*"
   :foreground	"Gold4"
 )
 
 (defsynprop *prop-unreadable*
   "unreadable"
-  :font		"*courier-medium-r*12*"
+  :font		"*courier-medium-r*-12-*"
   :foreground	"Gray25"
   :underline	t
 )
diff --git a/lisp/modules/progmodes/make.lsp b/lisp/modules/progmodes/make.lsp
index d5cbc00..702e135 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.2 2002/10/06 17:11:48 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/make.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
 ;;
 
 (require "syntax")
@@ -35,13 +35,13 @@
 
 (defsynprop *prop-shell*
     "shell"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"Red4"
 )
 
 (defsynprop *prop-variable*
     "variable"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :foreground	"Red3"
 )
 
@@ -49,7 +49,7 @@
 ;; tabs in the start of lines for better visualization.
 (defsynprop *prop-tabulation*
     "tabulation"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :background	"Gray90"
 )
 
diff --git a/lisp/modules/progmodes/man.lsp b/lisp/modules/progmodes/man.lsp
index 77a59a8..7f64653 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.2 2002/10/06 17:11:48 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/man.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
 ;;
 
 (require "syntax")
@@ -35,19 +35,19 @@
 
 (defsynprop *prop-man-b*
     "b"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"gray12"
 )
 
 (defsynprop *prop-man-i*
     "i"
-    :font	"*courier-medium-o*12*"
+    :font	"*courier-medium-o*-12-*"
     :foreground	"black"
 )
 
 (defsynprop *prop-man-bi*
     "bi"
-    :font	"*courier-bold-o*12*"
+    :font	"*courier-bold-o*-12-*"
     :foreground	"gray20"
 )
 
@@ -71,13 +71,13 @@
 
 (defsynprop *prop-man-escape*
     "escape"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"RoyalBlue4"
 )
 
 (defsynprop *prop-man-string*
     "string"
-    :font	"*lucidatypewriter-bold-r*12*"
+    :font	"*lucidatypewriter-bold-r*-12-*"
     :foreground	"RoyalBlue3"
 ;    :underline	t
 )
diff --git a/lisp/modules/progmodes/rpm.lsp b/lisp/modules/progmodes/rpm.lsp
index bd0cc6c..3a524b7 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.1 2003/01/16 03:50:46 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/rpm.lsp,v 1.2 2004/01/08 21:29:12 paulo Exp $
 ;;
 
 (require "syntax")
@@ -37,13 +37,13 @@
 #|
 (defsynprop *prop-rpm-special*
     "rpm-special"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"NavyBlue"
 )
 
 (defsynprop *prop-rpm-escape*
     "rpm-escape"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"Red3")
 
 ;; main package is implicit
diff --git a/lisp/modules/progmodes/sgml.lsp b/lisp/modules/progmodes/sgml.lsp
index 511aae5..66e6ae2 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.2 2002/10/06 17:11:48 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/sgml.lsp,v 1.3 2004/01/08 21:29:12 paulo Exp $
 ;;
 
 (require "syntax")
@@ -100,7 +100,7 @@
 
 (defsynprop *prop-sgml-maybe-entity*
     "maybe-entity"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"VioletRed4"
     :background	"LightYellow"
 )
diff --git a/lisp/modules/progmodes/sh.lsp b/lisp/modules/progmodes/sh.lsp
index 79679ed..120f244 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.1 2003/01/16 03:50:46 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/sh.lsp,v 1.2 2004/01/08 21:29:13 paulo Exp $
 ;;
 
 (require "syntax")
@@ -36,17 +36,17 @@
 
 (defsynprop *prop-escape*
     "escape"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"Red3")
 
 (defsynprop *prop-variable*
     "variable"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"Gold4")
 
 (defsynprop *prop-backslash*
     "backslash"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"green4")
 
 ;; XXX it would be interesting if "here-documents" could be parsed
diff --git a/lisp/modules/progmodes/xlog.lsp b/lisp/modules/progmodes/xlog.lsp
index 6bc8b57..8628dd3 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.1 2003/01/16 06:25:51 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/xlog.lsp,v 1.2 2004/01/08 21:29:13 paulo Exp $
 ;;
 
 (require "syntax")
@@ -35,29 +35,29 @@
 
 (defsynprop *prop-xlog-probe*
     "xlog-probe"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :background	"rgb:c/f/c")
 
 (defsynprop *prop-xlog-config*
     "xlog-config"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :background	"rgb:c/e/f")
 
 (defsynprop *prop-xlog-default*
     "xlog-default"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :background	"rgb:e/c/f")
 
 (defsynprop *prop-xlog-warning*
     "xlog-warning"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"Red4"
     :background	"Yellow1"
 )
 
 (defsynprop *prop-xlog-error*
     "xlog-error"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"Yellow2"
     :background	"Red3"
 )
diff --git a/lisp/modules/progmodes/xrdb.lsp b/lisp/modules/progmodes/xrdb.lsp
index c0a099c..b6ee71a 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.2 2002/10/06 17:11:48 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/progmodes/xrdb.lsp,v 1.3 2004/01/08 21:29:13 paulo Exp $
 ;;
 
 (require "syntax")
@@ -35,13 +35,13 @@
 
 (defsynprop *prop-xrdb-comment*
     "xrdb-comment"
-    :font	"*courier-medium-o*12*"
+    :font	"*courier-medium-o*-12-*"
     :foreground	"sienna"
 )
 
 (defsynprop *prop-xrdb-special*
     "format"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"RoyalBlue4"
 )
 
diff --git a/lisp/modules/syntax.lsp b/lisp/modules/syntax.lsp
index c297235..835e41d 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.11 2003/01/16 03:50:46 paulo Exp $
+;; $XFree86: xc/programs/xedit/lisp/modules/syntax.lsp,v 1.12 2004/01/08 21:29:11 paulo Exp $
 ;;
 
 (provide "syntax")
@@ -126,60 +126,60 @@ is used.
 ;; sources in different programming languages.
 (defsynprop *prop-default*
     "default"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :foreground	"black")
 
 (defsynprop *prop-keyword*
     "keyword"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"gray12")
 
 (defsynprop *prop-number*
     "number"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"OrangeRed3")
 
 (defsynprop *prop-string*
     "string"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"RoyalBlue2")
 
 (defsynprop *prop-constant*
     "constant"
-    :font	"*lucidatypewriter-medium-r*12*"
+    :font	"*lucidatypewriter-medium-r*-12-*"
     :foreground	"VioletRed3")
 
 (defsynprop *prop-comment*
     "comment"
-    :font	"*courier-medium-o*12*"
+    :font	"*courier-medium-o*-12-*"
     :foreground	"SlateBlue3")
 
 (defsynprop *prop-preprocessor*
     "preprocessor"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :foreground	"green4")
 
 (defsynprop *prop-punctuation*
     "punctuation"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"gray12")
 
 ;; Control characters, not always errors...
 (defsynprop *prop-control*
     "control"
-    :font	"*courier-bold-r*12*"
+    :font	"*courier-bold-r*-12-*"
     :foreground	"yellow2"
     :background	"red3")
 
 (defsynprop *prop-error*
     "error"
-    :font	"*new century schoolbook-bold*24*"
+    :font	"*new century schoolbook-bold*-24-*"
     :foreground	"yellow"
     :background	"red")
 
 (defsynprop *prop-annotation*
     "annotation"
-    :font	"*courier-medium-r*12*"
+    :font	"*courier-medium-r*-12-*"
     :foreground	"black"
     :background	"PaleGreen")