X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=db66bf74291ed1e56dae64adfbe65d81ded9d4c0;hb=146b3f5c28f6026c463939841bd44102d0513c59;hp=7344994a0524402974c856ddb979c0823d264061;hpb=e4105e7bbda27233e16b3c71b479f50a481dc014;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7344994..db66bf7 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -27,7 +27,6 @@
 
 
 (add-to-list 'auto-mode-alist '("emacs\\'" . emacs-lisp-mode))
-(fringe-mode 0)
 
 
 
@@ -45,6 +44,12 @@
 ;; elscreen should be placed begin of https://github.com/knu/elscreen/issues/6
 ;(elscreen-start)
 ;(require 'init-elscreen)
+;(require 'elscreen)
+;(custom-set-faces
+; '(elscreen-tab-current-screen-face ((t (:background "Yellow" :foreground "black"))))
+; '(elscreen-tab-other-screen-face ((t (:background "gray22" :foreground "black")))))
+
+
 (require 'init-color-theme)
 
 
@@ -136,7 +141,6 @@
 
 (require 'init-key-binding)
 
-(require 'linum-relative)
 (winner-mode 1)
 
 (global-set-key (kbd "C-c C-l") 'winner-redo)
@@ -148,8 +152,6 @@
 ;(require 'eyebrowse)
 ;(eyebrowse-mode t)
 
-(require 'workgroups2)
-;;;;(workgroups-mode 1)
 
 
 ;;(require 'minibuffer-line)
@@ -190,11 +192,7 @@
 
 
 
-;;; map C-W in minibuffer to delete word before cussor
-
-
-
-;(require 'evil-escape)
+(require 'evil-escape)
 ;(setq-default evil-escape-delay 0.2)	
 ;(setq evil-escape-excluded-major-modes '(dired-mode))
 ;(setq-default evil-escape-key-sequence "jj")
@@ -215,3 +213,62 @@
     (when file
       (find-file file))))
 
+
+
+;; http://stackoverflow.com/questions/11484225/fix-an-auto-complete-mode-and-linum-mode-annoyance
+(ac-linum-workaround)
+
+
+;; ---------------------------------
+;; linum-relative
+
+(require 'linum-relative)
+
+(custom-set-variables
+ '(fringe-mode (quote (4 . 0)) nil (fringe)))
+
+;; maybe better to fix the size of line number rather scaled 0.8
+;; https://github.com/howardabrams/dot-files/blob/master/emacs.org
+(custom-set-faces
+ '(highlight-current-line-face ((t (:background "gray22"))))
+ '(linum ((t (:background "#000000" :foreground "gray40" :height 0.8 :slant italic :weigth light))))
+ '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8)))))
+
+
+;; enable linum-relative in programming mode
+;https://github.com/howardabrams/dot-files/blob/master/emacs.org
+(add-hook 'prog-mode-hook 'linum-mode)
+
+
+;; hight current line
+(require 'highlight-current-line)
+(highlight-current-line-on t)
+
+
+
+;(defun pl-fringe-mode ()
+;  "jfoewoif"
+;  (if linum-mode
+;      (fringe-mode '(4 . 0))
+;    (fringe-mode '(0 . 0))))
+
+
+;(add-hook 'eshell-mode-hook 'pl-fringe-mode)
+;(add-hook 'prog-mode-hook 'pl-fringe-mode)
+
+
+
+
+
+(require 'workgroups2)
+
+
+(setq wg-prefix-key (kbd "C-c z"))
+(setq wg-session-file "~/.emacs.d/.emacs_workgroups")
+(setq wg-mode-line-display-on t)          ; Default: (not (featurep 'powerline))
+(setq wg-flag-modified t)                 ; Display modified flags as well
+(setq wg-mode-line-decor-left-brace "["
+      wg-mode-line-decor-right-brace "]"  ; how to surround it
+      wg-mode-line-decor-divider ":")
+;(workgroups-mode 1)
+