X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Finit.el;h=0a589664559846ac61432dec4702a6838cc16038;hb=faafbd27ecdd1ea195ce868e24f5390360ea3086;hp=14ffd194b7e7877a5b42fcf2af99ce68f84b5b24;hpb=db5b91c0337c64ed5dbc3c213699ab5784e25126;p=dotfiles.git

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 14ffd19..0a58966 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -44,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)
 
 
@@ -146,8 +152,6 @@
 ;(require 'eyebrowse)
 ;(eyebrowse-mode t)
 
-(require 'workgroups2)
-;;;;(workgroups-mode 1)
 
 
 ;;(require 'minibuffer-line)
@@ -219,15 +223,67 @@
 ;; linum-relative
 
 
-(require 'linum-relative)
-
 (custom-set-variables
- '(fringe-mode (quote (4 . 0)) nil (fringe)))
-
+ ;; custom-set-variables 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.
+ '(fringe-mode (quote (4 . 0)) nil (fringe))
+ '(ggtags-split-window-function (quote split-window-vertically))
+ '(hes-mode-alist
+   (quote
+    ((c-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
+     (cperl-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
+     (c++-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
+     (objc-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]+\\|u[[:xdigit:]]\\{4\\}\\|U[[:xdigit:]]\\{8\\}\\|[\"'?\\abfnrtv]\\)\\)")
+     (java-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|u[[:xdigit:]]\\{4\\}\\|[\"'\\bfnrt]\\)\\)")
+     (js-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)")
+     (js2-mode . "\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{2\\}\\|u[[:xdigit:]]\\{4\\}\\|.\\)\\)")
+     (ruby-mode
+      ("\\(\\\\\\([0-7]\\{1,3\\}\\|x[[:xdigit:]]\\{1,2\\}\\|u\\(?:[[:xdigit:]]\\{4\\}\\|{[[:xdigit:]]\\{1,6\\}\\(?:[[:space:]]+[[:xdigit:]]\\{1,6\\}\\)*}\\)\\|.\\)\\)"
+       (0
+	(let*
+	    ((state
+	      (syntax-ppss))
+	     (term
+	      (nth 3 state)))
+	  (when
+	      (or
+	       (and
+		(eq term 39)
+		(member
+		 (match-string 2)
+		 (quote
+		  ("\\" "'"))))
+	       (if
+		   (fboundp
+		    (quote ruby-syntax-expansion-allowed-p))
+		   (ruby-syntax-expansion-allowed-p state)
+		 (memq term
+		       (quote
+			(34 47 10 96 t)))))
+	    (add-face-text-property
+	     (match-beginning 1)
+	     (match-end 1)
+	     (quote hes-escape-backslash-face))
+	    (add-face-text-property
+	     (match-beginning 2)
+	     (match-end 2)
+	     (quote hes-escape-sequence-face))
+	    nil))
+	prepend))))))
+ '(org-agenda-files (quote ("~/temp/org-note.org")))
+ '(powerline-text-scale-factor 0.85))
+
+;; 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))))
- '(linum-relative-current-face ((t (:inherit linum :foreground "Yellow" :weight light :height 0.8)))))
+ ;; 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.
+ '(mode-line ((t (:foreground "#030303" :background "#bdbdbd" :box nil :family "Source Code Pro for Powerline" :height 100))))
+ '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil :family "Source Code Pro for Powerline" :height 100)))))
 
 
 ;; enable linum-relative in programming mode
@@ -235,10 +291,52 @@
 (add-hook 'prog-mode-hook 'linum-mode)
 
 
-
-
-;(require 'highli
+;; 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)
+
+(defalias 'perl-mode 'cperl-mode)
+;(setq cperl-invalid-face nil)
+ (setq cperl-invalid-face (quote off))
+;(add-hook 'prog-mode-hook '(lambda () 
+;        (highlight-regexp "%[[:alpha:]]\\|\\\\[[:alpha:]]")))
+
+(require 'highlight-escape-sequences)
+(hes-mode)
+;(setq cperl-font-lock t)
+(put 'hes-escape-backslash-face 'face-alias 'font-lock-builtin-face)
+(put 'hes-escape-sequence-face 'face-alias 'font-lock-builtin-face)
+
+
+(add-to-list 'load-path "~/.emacs.d/Emacs-PDE-0.2.16/lisp/")
+(load "pde-load")
+
+(require 'init-linum)