README.md

@@ -12,7 +12,7 @@ Go to your `Packages` subdirectory under ST2's data directory:
 
 * Windows: `%APPDATA%\Sublime Text 2`
 * OS X: `~/Library/Application Support/Sublime Text 2/Packages`
-* Linux: `~/.config/sublime-text-2/Packages`
+* Linux: `~/.config/sublime-text-2`
 * Portable Installation: `Sublime Text 2/Data`
 
 Then clone this repository:
@@ -33,10 +33,6 @@ menu.
 
 The default toggle highlight shortcut is ```ctrl+alt+w``` (```cmd+alt+w``` for OS X)
 
-### Disable highlighting when Sublime Text starts up
-
-Change `highlight_whitespaces_enabled` from the default of `true` to `false`.
-
 ### Change the highlighting color
 
 One may also change the highlighting color, providing a scope name such

highlight_whitespaces.py

@@ -14,7 +14,6 @@ Config summary (see README.md for details):
     "highlight_whitespaces_enabled": true,
     "highlight_whitespaces_check_spaces": true,
     "highlight_whitespaces_check_tabs": true,
-    "highlight_whitespaces_single_space": false,
     "highlight_last_whitespace": true
     }
 
@@ -32,7 +31,6 @@ DEFAULT_MAX_FILE_SIZE = 1048576
 DEFAULT_COLOR_SCOPE_NAME = "invalid"
 DEFAULT_IS_ENABLED = True
 DEFAULT_CHECK_SPACES = True
-DEFAULT_SINGLE_SPACE = False
 DEFAULT_CHECK_TABS = True
 DEFAULT_LAST_WHITESPACE = False
 
@@ -41,25 +39,16 @@ hws_settings = sublime.load_settings('highlight_whitespaces.sublime-settings')
 hws_enabled = bool(hws_settings.get('highlight_whitespaces_enabled',
                                                DEFAULT_IS_ENABLED))
 
-def get_settings():
-    s = sublime.load_settings('highlight_whitespaces.sublime-settings')
-    return s
-
 # Determine if the view is a find results view
 def is_find_results(view):
     return view.settings().get('syntax') and "Find Results" in view.settings().get('syntax')
 
 # Return an array of regions matching whitespaces.
 def find_whitespaces_spaces(view):
-    hws_settings = get_settings()
     last_whitespace = bool(hws_settings.get('highlight_last_whitespace',DEFAULT_LAST_WHITESPACE))
-    single_space = bool(hws_settings.get('highlight_whitespaces_single_space',DEFAULT_SINGLE_SPACE))
+    regex = ' {2,}'
-    if single_space:
+    if last_whitespace:
-        regex = ' +'
+        regex += '| {1,}$'
-    else:
-        regex = ' {2,}|\t | \t'
-        if last_whitespace:
-            regex += '| {1,}$'
 
     return view.find_all(regex)
 
@@ -69,8 +58,6 @@ def find_whitespaces_tabs(view):
 
 # Highlight whitespaces
 def highlight_whitespaces(view):
-    hws_settings = get_settings()
-
     max_size = hws_settings.get('highlight_whitespaces_file_max_size',
                                DEFAULT_MAX_FILE_SIZE)
     space_scope_name = hws_settings.get('highlight_whitespaces_space_highlight_scope_name',