From b418a016c8198df971e001e8026e0b26215c4ad3 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Sun, 5 Oct 2014 22:56:23 +0200 Subject: [PATCH] Update init.el with faces for whitespace and line hilite --- init.el | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/init.el b/init.el index 7cb8d20..e4e1d29 100644 --- a/init.el +++ b/init.el @@ -8,11 +8,13 @@ '(blink-cursor-mode t) '(column-number-mode t) '(cursor-color "#5c5cff") + '(cursor-type (quote bar) t) '(custom-enabled-themes (quote (tango-dark))) '(custom-safe-themes (quote ("1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) '(ediff-merge-split-window-function (quote split-window-horizontally)) '(ediff-split-window-function (quote split-window-vertically)) '(foreground-color "#5c5cff") + '(global-hl-line-mode t) '(helm-gtags-auto-update t) '(helm-gtags-ignore-case t) '(helm-gtags-path-style (quote relative)) @@ -22,6 +24,7 @@ '(nxml-outline-child-indent 4) '(cursor-type 'bar) '(tab-width 4) + '(nyan-wavy-trail t) '(package-archives (quote (("gnu" . "http://elpa.gnu.org/packages/") ("marmalade" . "http://marmalade-repo.org/packages/") ("e6h" . "http://www.e6h.org/packages/")))) '(safe-local-variable-values (quote ((company-clang-arguments "-I.." "-I/home/polesz/jhbuild/install/include" "-I/home/polesz/jhbuild/install/include/atk-1.0" "-I/home/polesz/jhbuild/install/include/at-spi-2.0" "-I/home/polesz/jhbuild/install/include/at-spi2-atk/2.0" "-I/home/polesz/jhbuild/install/include/cairo" "-I/home/polesz/jhbuild/install/include/gdk-pixbuf-2.0" "-I/home/polesz/jhbuild/install/include/gio-unix-2.0/" "-I/home/polesz/jhbuild/install/include/glib-2.0" "-I/home/polesz/jhbuild/install/include/gtk-3.0" "-I/home/polesz/jhbuild/install/include/harfbuzz" "-I/home/polesz/jhbuild/install/include/libgda-5.0" "-I/home/polesz/jhbuild/install/include/libgda-5.0/libgda" "-I/home/polesz/jhbuild/install/include/librsvg-2.0" "-I/home/polesz/jhbuild/install/include/libsoup-2.4" "-I/home/polesz/jhbuild/install/include/pango-1.0" "-I/home/polesz/jhbuild/install/include/swe-glib" "-I/home/polesz/jhbuild/install/include/webkitgtk-4.0" "-I/home/polesz/jhbuild/install/lib/glib-2.0/include" "-I/usr/include/dbus-1.0" "-I/usr/include/freetype2" "-I/usr/include/libdrm" "-I/usr/include/libpng16" "-I/usr/include/libxml2" "-I/usr/include/pixman-1" "-I/usr/lib64/dbus-1.0/include") (company-clang-arguments "-I/home/polesz/jhbuild/install/include" "-I/home/polesz/jhbuild/install/include/atk-1.0" "-I/home/polesz/jhbuild/install/include/at-spi-2.0" "-I/home/polesz/jhbuild/install/include/at-spi2-atk/2.0" "-I/home/polesz/jhbuild/install/include/cairo" "-I/home/polesz/jhbuild/install/include/gdk-pixbuf-2.0" "-I/home/polesz/jhbuild/install/include/gio-unix-2.0/" "-I/home/polesz/jhbuild/install/include/glib-2.0" "-I/home/polesz/jhbuild/install/include/gtk-3.0" "-I/home/polesz/jhbuild/install/include/harfbuzz" "-I/home/polesz/jhbuild/install/include/libgda-5.0" "-I/home/polesz/jhbuild/install/include/libgda-5.0/libgda" "-I/home/polesz/jhbuild/install/include/librsvg-2.0" "-I/home/polesz/jhbuild/install/include/libsoup-2.4" "-I/home/polesz/jhbuild/install/include/pango-1.0" "-I/home/polesz/jhbuild/install/include/swe-glib" "-I/home/polesz/jhbuild/install/include/webkitgtk-4.0" "-I/home/polesz/jhbuild/install/lib/glib-2.0/include" "-I/usr/include/dbus-1.0" "-I/usr/include/freetype2" "-I/usr/include/libdrm" "-I/usr/include/libpng16" "-I/usr/include/libxml2" "-I/usr/include/pixman-1" "-I/usr/lib64/dbus-1.0/include") (company-clang-arguments "-I/usr/include/glib-2.0"))))) @@ -30,9 +33,8 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(my-long-line-face ((((class color)) (:background "gray10"))) t) - '(my-tab-face ((((class color)) (:background "grey10"))) t) - '(my-trailing-space-face ((((class color)) (:background "gray10"))) t)) + '(hl-line ((t (:inherit nil :background "gray25")))) + '(my-trailing-space-face ((((class color)) (:background "red"))) t)) (add-to-list 'load-path "~/.emacs.d") (add-to-list 'load-path "~/.emacs.d/nyan-mode") @@ -59,11 +61,9 @@ (load "gnu-c-header.el") (load "gobgen/gobgen.el") (load "toggle-window-split.el") -;;(load "elpa/move-line-0.0.1/move-line.el") (add-hook 'c-mode-hook 'helm-gtags-mode) (add-hook 'c-mode-hook 'which-func-mode) - (add-hook 'c-mode-common-hook (lambda() (local-set-key (kbd "C-c o") 'ff-find-other-file))) @@ -81,30 +81,20 @@ (add-hook 'c-mode-common-hook (lambda() (local-set-key (kbd "C-c o") 'ff-find-other-file))) -(global-set-key (kbd "M-up") 'move-line-up) -(global-set-key (kbd "M-down") 'move-line-down) +(global-set-key (kbd "M-") 'move-line-up) +(global-set-key (kbd "M-") 'move-line-down) -(setq whitespace-style '(tabs trailing lines tab-mark)) -(setq whitespace-line-column 78) (global-whitespace-mode 1) (setq-default indent-tabs-mode nil) (defvaralias 'c-basic-offset 'tab-width) (defvaralias 'cperl-indent-level 'tab-width) (add-hook 'font-lock-mode-hook - (function - (lambda () - (setq font-lock-keywords - (append font-lock-keywords - '( - ("\t+" (0 'my-tab-face t)) - ("^.\\{81,\\}$" (0 'my-long-line-face t)) - ("[ \t]+$" (0 'my-trailing-space-face t)) - ) - ) - ) - ) - ) -) + (function + (lambda () + (setq font-lock-keywords + (append font-lock-keywords + '( + ("[ \t]+$" (0 'my-trailing-space-face t)))))))) (c-add-style "my" '( (c-basic-offset . 4) @@ -187,9 +177,3 @@ (setq rcirc-default-user-name "polesz") (setq rcirc-default-full-name "Gergely Polonkai") (add-hook 'after-init-hook 'fiplr-clear-cache) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - )