[climacs-cvs] CVS climacs

[thenriksen]

Update of /project/climacs/cvsroot/climacs
In directory clnet:/tmp/cvs-serv27613

Modified Files:
	lisp-syntax.lisp 
Log Message:
Removed *climacs-features* since it wasn't used for its intended
purpose and got out of sync with *features*. 

Also added +'s to the name of a symbol naming a constant.


--- /project/climacs/cvsroot/climacs/lisp-syntax.lisp	2006/02/09 15:26:08	1.45
+++ /project/climacs/cvsroot/climacs/lisp-syntax.lisp	2006/03/01 19:32:07	1.46
@@ -1388,8 +1388,6 @@
 	    (call-next-method)))
 	(call-next-method))))
 
-(defparameter climacs-gui::*climacs-features* (copy-list *features*))
-
 (defgeneric eval-feature-conditional (conditional-form syntax))
 
 (defmethod eval-feature-conditional (conditional-form (syntax lisp-syntax))
@@ -1397,7 +1395,7 @@
 
 ;; Adapted from slime.el
 
-(defconstant keyword-package (find-package :keyword)
+(defconstant +keyword-package+ (find-package :keyword)
   "The KEYWORD package.")
 
 (defmethod eval-feature-conditional ((conditional token-mixin) (syntax lisp-syntax))
@@ -1405,8 +1403,8 @@
 					 (start-offset conditional)
 					 (end-offset conditional))
 		  'string))
-	 (symbol (parse-symbol string keyword-package)))
-    (member symbol climacs-gui::*climacs-features*)))
+	 (symbol (parse-symbol string +keyword-package+)))
+    (member symbol *features*)))
 
 (defmethod eval-feature-conditional ((conditional list-form) (syntax lisp-syntax))
   (let ((children (children conditional)))
@@ -1424,7 +1422,7 @@
 						     (start-offset type)
 						     (end-offset type))
 				    'string))
-	       (type-symbol (parse-symbol type-string keyword-package)))
+	       (type-symbol (parse-symbol type-string +keyword-package+)))
 	  (case type-symbol
 	    (:and (funcall #'every #'eval-fc conditionals))
 	    (:or (funcall #'some #'eval-fc conditionals))
@@ -1795,7 +1793,7 @@
   "Find the symbol named STRING.
 Return the symbol and a flag indicating whether the symbol was found."
   (multiple-value-bind (symbol-name package-name) (parse-token string)
-    (let ((package (cond ((string= package-name "") keyword-package)
+    (let ((package (cond ((string= package-name "") +keyword-package+)
                          (package-name              (find-package package-name))
                          (t                         package))))
       (if package