[slime-cvs] CVS slime

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime
In directory tiger.common-lisp.net:/tmp/cvs-serv11631

Modified Files:
	ChangeLog swank-clisp.lisp 
Log Message:
* swank-clisp.lisp (c-error): The number of parameters to
sys::c-warn was changed, accommodate both versions.


--- /project/slime/cvsroot/slime/ChangeLog	2012/02/07 15:48:15	1.2294
+++ /project/slime/cvsroot/slime/ChangeLog	2012/02/12 15:38:06	1.2295
@@ -1,3 +1,8 @@
+2012-02-12  Stas Boukarev  <stassats at gmail.com>
+
+	* swank-clisp.lisp (c-error): The number of parameters to
+	sys::c-warn was changed, accommodate both versions.
+
 2012-02-07  Martin Simmons (martin at lispworks.com>
 
 	* swank-lispworks.lisp (dspec-file-position): Fall back to regexp
--- /project/slime/cvsroot/slime/swank-clisp.lisp	2011/12/03 12:03:26	1.99
+++ /project/slime/cvsroot/slime/swank-clisp.lisp	2012/02/12 15:38:06	1.100
@@ -636,8 +636,15 @@
   (dynamic-flet ((sys::c-warn *orig-c-warn*))
     (signal-compiler-warning cstring args :style-warning *orig-c-style-warn*)))
 
-(defun c-error (cstring &rest args)
-  (signal-compiler-warning cstring args :error *orig-c-error*))
+(defun c-error (&rest args)
+  (signal (make-condition 'compiler-condition
+                          :severity :error
+                          :message (apply #'format nil
+                                          (if (= (length args) 3)
+                                              (cdr args)
+                                              args))
+                          :location (compiler-note-location)))
+  (apply *orig-c-error* args))
 
 (defimplementation call-with-compilation-hooks (function)
   (handler-bind ((warning #'handle-notification-condition))