[Xorg-commit] xc/programs/xedit/lisp/modules/progmodes c.lsp,1.1,1.1.4.1 imake.lsp,1.1,1.1.4.1 lisp.lsp,1.1,1.1.4.1 make.lsp,1.1,1.1.4.1 man.lsp,1.1,1.1.4.1 rpm.lsp,1.1,1.1.4.1 sgml.lsp,1.1,1.1.4.1 sh.lsp,1.1,1.1.4.1 xlog.lsp,1.1,1.1.4.1 xrdb.lsp,1.1,1.1.4.1
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
Committed by: kaleb
Update of /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xedit/lisp/modules/progmodes
Modified Files:
Tag: XORG-CURRENT
c.lsp imake.lsp lisp.lsp make.lsp man.lsp rpm.lsp sgml.lsp
sh.lsp xlog.lsp xrdb.lsp
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: c.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/c.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/c.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/c.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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)
)
Index: imake.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/imake.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/imake.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/imake.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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"
)
Index: lisp.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/lisp.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/lisp.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/lisp.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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
)
Index: make.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/make.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/make.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/make.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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"
)
Index: man.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/man.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/man.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/man.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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
)
Index: rpm.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/rpm.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/rpm.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/rpm.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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
Index: sgml.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/sgml.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/sgml.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/sgml.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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"
)
Index: sh.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/sh.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/sh.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/sh.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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
Index: xlog.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/xlog.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/xlog.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/xlog.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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"
)
Index: xrdb.lsp
===================================================================
RCS file: /cvs/xorg/xc/programs/xedit/lisp/modules/progmodes/xrdb.lsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/xrdb.lsp 14 Nov 2003 16:49:22 -0000 1.1
+++ b/xrdb.lsp 23 Feb 2004 21:37:49 -0000 1.1.4.1
@@ -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"
)
More information about the xorg-commit
mailing list