Revert hl-line changes

Squashed commit of the following:

commit 5676a6acbd
Author: 10sr <8slashes+git@gmail.com>
Date:   Thu Feb 4 00:40:58 2016 +0900

    Revert "WIP fix of hl-line"

    This reverts commit ccd229c42b.

commit ae4953d699
Author: 10sr <8slashes+git@gmail.com>
Date:   Thu Feb 4 00:40:56 2016 +0900

    Revert "WIP fix for hl-line"

    This reverts commit bacae367e8.

commit 79b0bd2917
Author: 10sr <8slashes+git@gmail.com>
Date:   Thu Feb 4 00:40:54 2016 +0900

    Revert "WIP experimental fix of hl-line"

    This reverts commit fc2c314f83.

emacs.el

@@ -723,34 +723,19 @@ IF OK-IF-ALREADY-EXISTS is true force download."
 
 ;; highlight current line
 ;; http://wiki.riywo.com/index.php?Meadow
-;; (defface 10sr-hl-line
-;;   '((((min-colors 256)
-;;       (background dark))
-;;      (:background "color-234"))
-;;     (((min-colors 256)
-;;       (background light))
-;;      (:background "color-234"))
-;;     (t
-;;      (:underline "black")))
-;;   "*Face used by hl-line."
-;;   :group '10sr)
 (defface 10sr-hl-line
-  '((t (:underline "black")))
+  '((((min-colors 256)
+      (background dark))
+     (:background "color-234"))
+    (((min-colors 256)
+      (background light))
+     (:background "color-234"))
+    (t
+     (:underline "black")))
   "*Face used by hl-line."
   :group '10sr)
 (global-hl-line-mode 1) ;; (hl-line-mode 1)
-(if (< (display-color-cells)
-       256)
-    ;; 8 colors
-    (progn
-      (set-face-underline 'hl-line t)
-      (set-face-background 'hl-line "unspecified-bg")
-      (set-face-foreground 'hl-line "unspecified-fg"))
-  ;; 256 colors
-  (set-face-background 'hl-line "color-235")
-  ;;(set-face-foreground 'hl-line "unspecified-fg")
-  )
-;; (set-variable 'hl-line-face '10sr-hl-line) ;; (setq hl-line-face nil)
+(set-variable 'hl-line-face '10sr-hl-line) ;; (setq hl-line-face nil)
 (set-variable 'hl-line-global-modes
               '(not
                 term-mode))
@@ -979,10 +964,6 @@ IF OK-IF-ALREADY-EXISTS is true force download."
           ("\\.asciidoc\\'" . adoc-mode)
           ,@auto-mode-alist)))
 
-;; (require 'markup-faces)
-;; (set-face-foreground 'markup-meta-hide-face
-;;                      "unspecified-fg")
-
 (setq auto-mode-alist
       `(("autostart\\'" . sh-mode)
         ("xinitrc\\'" . sh-mode)