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

diff --git a/emacs.d/init.el b/emacs.d/init.el
index ca3d88c..0a58966 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -222,7 +222,6 @@
 ;; ---------------------------------
 ;; linum-relative
 
-(require 'linum-relative)
 
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
@@ -231,6 +230,48 @@
  ;; 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))
 
@@ -241,9 +282,6 @@
  ;; 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.
- '(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))))
  '(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)))))
 
@@ -285,3 +323,20 @@
       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)