From a3559bdd974ac909ba24c77a0f69755540138233 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 4 Feb 2016 00:41:43 +0900 Subject: [PATCH] Revert hl-line changes Squashed commit of the following: commit 5676a6acbd0a2e1a918cf01b67399505edb41f0f Author: 10sr <8slashes+git@gmail.com> Date: Thu Feb 4 00:40:58 2016 +0900 Revert "WIP fix of hl-line" This reverts commit ccd229c42b9fc745c8436f8f21f8ad66a1d4b23c. commit ae4953d69963f207d407b6549d0bb7a6c2e16b49 Author: 10sr <8slashes+git@gmail.com> Date: Thu Feb 4 00:40:56 2016 +0900 Revert "WIP fix for hl-line" This reverts commit bacae367e8c7f93a1b499584ea0b850edff0863a. commit 79b0bd291781c8176f4a46d4e7e4c50b77ce2d47 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 fc2c314f834e7fc421e9ce74e33c18bb7fd7aaae. --- emacs.el | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/emacs.el b/emacs.el index a56f270..9b42ac0 100644 --- a/emacs.el +++ b/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)