--- a/SmallSense__SmalltalkLintService.st	Mon May 18 16:49:55 2015 +0200
+++ b/SmallSense__SmalltalkLintService.st	Mon May 18 16:50:32 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
 	      All Rights Reserved
@@ -204,8 +206,12 @@
             "/xxxx
             rulesHierarchical := rulesHolder value.
             rulesHierarchical notNil ifTrue:[
+                "/ remove globally disabled rules
                 disabledRules := SmalltalkChecker forceDisabledRules.
                 ruleList := rulesHierarchical flattened reject:[:each| disabledRules includes: each class name].
+
+                "/ remove user-disabled rules
+                ruleList := rulesHierarchical flattened reject:[:each| SmalltalkChecker isRuleDisabled:each class].
                 ruleList := ruleList collect:[ :e | e class new ].
                 rules := RBCompositeLintRule rules: ruleList.
                 highlighter rules: ruleList.
@@ -339,6 +345,7 @@
                             self showInfo:(('Smalltalk Lint: ',errMsg) colorizeAllWith:Color red).
                         ] do:[
                             env := (SmallSense::SmalltalkUnacceptedMethodEnvironment onClass:cls methodSource: oldCode).
+                            rules rejectRules:[:rule | SmalltalkChecker isRuleDisabled:rule class].
                             SmalltalkChecker runRule: rules onEnvironment: env
                         ].
                         delayed ifTrue:[
@@ -427,7 +434,7 @@
 !SmalltalkLintService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/smallsense/SmallSense__SmalltalkLintService.st,v 1.3 2015-03-03 11:10:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/smallsense/SmallSense__SmalltalkLintService.st,v 1.4 2015-05-18 14:50:32 cg Exp $'
 !
 
 version_CVS
@@ -440,6 +447,6 @@
 !
 
 version_SVN
-    ^ '$Id: SmallSense__SmalltalkLintService.st,v 1.3 2015-03-03 11:10:31 cg Exp $'
+    ^ '$Id: SmallSense__SmalltalkLintService.st,v 1.4 2015-05-18 14:50:32 cg Exp $'
 ! !