Merge pull request #228 from dmitmel/master

[pull] master from dmitmel:master

nvim/after/ftplugin/css.vim

@@ -0,0 +1 @@
+setlocal iskeyword+=-

nvim/after/ftplugin/scss.vim

@@ -0,0 +1 @@
+source <sfile>:h/css.vim

nvim/colors/dotfiles.vim

@@ -262,7 +262,8 @@
 " CSS {{{
   hi! link cssBraces        Delimiter
   hi! link cssTagName       htmlTagName
-  hi! link cssPseudoClassId Special
+  hi! link cssPseudoClassId Type
+  hi! link cssPseudoClass   cssPseudoClassId
   hi! link cssClassName     Type
   hi! link cssClassNameDot  cssClassName
   hi! link cssAtRule        Keyword
@@ -274,6 +275,12 @@
   hi! link cssAttrRegion    cssAttr
 " }}}
 
+" SCSS {{{
+  hi! link scssSelectorName cssClassName
+  hi! link scssSelectorChar cssClassnameDot
+  hi! link scssAmpersand    cssSelectorOp
+" }}}
+
 " JavaScript {{{
   hi! link javaScriptBraces    Delimiter
   hi! link jsParens            Delimiter

script-resources/pycalc_startup.py

@@ -11,4 +11,21 @@ def factors(n):
     return result
 
 
+def solve_quadratic(a, b, c):
+    if a == 0:
+        raise Exception("not a quadratic equation")
+    else:
+        d = b ** 2 - 4 * a * c
+        print("D = " + str(d))
+        if d < 0:
+            print("no solutions")
+        elif d > 0:
+            sd = sqrt(d)
+            print("sqrt(D) = " + str(sd))
+            print("x1 = " + str((-b + sd) / (2 * a)))
+            print("x2 = " + str((-b - sd) / (2 * a)))
+        else:
+            print("x = " + str(-b / (2 * a)))
+
+
 print("loaded Python calculator")