From ee8c58af0f59d9e5b4307efcbf944f88b850343b Mon Sep 17 00:00:00 2001
From: Richard M Kreuter <kreuter@users.sourceforge.net>
Date: Fri, 11 Jul 2008 18:55:07 +0000
Subject: [PATCH] 1.0.18.17: Alter some STYLE-WARNING names introduced in
 1.0.18.16.

---
 package-data-list.lisp-expr   |  8 ++++----
 src/code/condition.lisp       | 14 ++++++++------
 src/code/foreign-load.lisp    |  3 ++-
 src/compiler/defconstant.lisp |  2 +-
 src/compiler/early-c.lisp     |  2 +-
 version.lisp-expr             |  2 +-
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 308b6bf78..411f3ea90 100644
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -1725,10 +1725,10 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
                "UNINTERESTING-REDEFINITION"
                "REDEFINITION-WITH-DEFTRANSFORM"
 
-               "IGNORING-ASTERISKS-IN-VARIABLE-NAME"
-               "IGNORING-ASTERISKS-IN-LEXICAL-VARIABLE-NAME"
-               "IGNORING-ASTERISKS-IN-CONSTANT-VARIABLE-NAME"
-               "UNDEFINED-ALIEN"
+               "DUBIOUS-ASTERISKS-AROUND-VARIABLE-NAME"
+               "ASTERISKS-AROUND-LEXICAL-VARIABLE-NAME"
+               "ASTERISKS-AROUND-CONSTANT-VARIABLE-NAME"
+               "UNDEFINED-ALIEN-STYLE-WARNING"
                #!+sb-eval
                "LEXICAL-ENVIRONMENT-TOO-COMPLEX"
                "CHARACTER-DECODING-ERROR-IN-COMMENT"
diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index 59afa4a4c..ace650cf7 100644
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -1468,7 +1468,7 @@ is signaled, if the warning if of this type, it will be muffled.")
                      (redefinition-with-deftransform-transform warning)))))
 
 ;;; Various other STYLE-WARNINGS
-(define-condition ignoring-asterisks-in-variable-name
+(define-condition dubious-asterisks-around-variable-name
     (style-warning simple-condition)
   ()
   (:report (lambda (warning stream)
@@ -1477,15 +1477,17 @@ the usual naming convention (names like *FOO*) for special variables"
                      (simple-condition-format-control warning)
                      (simple-condition-format-arguments warning)))))
 
-(define-condition ignoring-asterisks-in-lexical-variable-name
-    (ignoring-asterisks-in-variable-name)
+(define-condition asterisks-around-lexical-variable-name
+    (dubious-asterisks-around-variable-name)
   ())
 
-(define-condition ignoring-asterisks-in-constant-variable-name
-    (ignoring-asterisks-in-variable-name)
+(define-condition asterisks-around-constant-variable-name
+    (dubious-asterisks-around-variable-name)
   ())
 
-(define-condition undefined-alien (style-warning)
+;; We call this UNDEFINED-ALIEN-STYLE-WARNING because there are some
+;; subclasses of ERROR above having to do with undefined aliens.
+(define-condition undefined-alien-style-warning (style-warning)
   ((symbol :initarg :symbol :reader undefined-alien-symbol))
   (:report (lambda (warning stream)
              (format stream "Undefined alien: ~S"
diff --git a/src/code/foreign-load.lisp b/src/code/foreign-load.lisp
index bf693ef73..7f7445d1f 100644
--- a/src/code/foreign-load.lisp
+++ b/src/code/foreign-load.lisp
@@ -175,7 +175,8 @@ is never in the linkage-table."
               (error 'undefined-alien-error :name symbol))
              #!+linkage-table
              ((not addr)
-              (style-warn 'sb!kernel:undefined-alien :symbol symbol)
+              (style-warn 'sb!kernel:undefined-alien-style-warning
+                          :symbol symbol)
               (setf (gethash symbol undefineds) t)
               (remhash symbol symbols)
               (if datap
diff --git a/src/compiler/defconstant.lisp b/src/compiler/defconstant.lisp
index 9cc011cb0..1bb1d274d 100644
--- a/src/compiler/defconstant.lisp
+++ b/src/compiler/defconstant.lisp
@@ -24,7 +24,7 @@
   (unless (symbolp name)
     (error "The constant name is not a symbol: ~S" name))
   (when (looks-like-name-of-special-var-p name)
-    (style-warn 'sb!kernel:ignoring-asterisks-in-constant-variable-name
+    (style-warn 'sb!kernel:asterisks-around-constant-variable-name
                 :format-control "defining ~S as a constant"
                 :format-arguments (list name)))
   (sb!c:with-source-location (source-location)
diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index b6d0803a0..e04ad0344 100644
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -164,7 +164,7 @@
     ;; and then we happen to compile bar.lisp before foo.lisp.
   (when (looks-like-name-of-special-var-p symbol)
     ;; FIXME: should be COMPILER-STYLE-WARNING?
-    (style-warn 'sb!kernel:ignoring-asterisks-in-lexical-variable-name
+    (style-warn 'sb!kernel:asterisks-around-lexical-variable-name
                 :format-control
                 "using the lexical binding of the symbol ~S, not the~@
                  dynamic binding"
diff --git a/version.lisp-expr b/version.lisp-expr
index eeef0bfa1..ab14cc255 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.18.16"
+"1.0.18.17"
-- 
2.11.4.GIT