fix conflict

[dotfiles.git] / emacs.d / init.el

diff --git a/emacs.d/init.el b/emacs.d/init.el
index f90e303..9580c7a 100644 (file)
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -16,7 +16,7 @@
 (add-to-list 'default-frame-alist '(height . 40))
 ;(add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12:weight:light" ))
 (add-to-list 'default-frame-alist '(font . "Source Code Pro for Powerline-12" ))
-
+(setq inhibit-startup-message t)
 
 (put 'set-goal-column 'disabled nil)
 (setq vc-follow-symlinks t)
@@ -101,7 +101,6 @@
 ;(setq speedbar-show-unknown-files t)
 
 
-;(toggle-frame-fullscreen)
 
 
 (require 'projectile)
@@ -150,10 +149,10 @@
 ;(eyebrowse-mode t)
 
 (require 'workgroups2)
-(workgroups-mode 1)
+;;;;(workgroups-mode 1)
 
 
-(require 'minibuffer-line)
+;;(require 'minibuffer-line)
 ;(minibuffer-line-mode 1)
 
 
@@ -173,3 +172,30 @@
 
 
 
+
+;;; set font size of minibuffer
+;;;; http://stackoverflow.com/questions/7869429/altering-the-font-size-for-the-emacs-minibuffer-separately-from-default-emacs
+(add-hook 'minibuffer-setup-hook 'my-minibuffer-setup)
+(defun my-minibuffer-setup ()
+       (set (make-local-variable 'face-remapping-alist)
+          '((default :height 120))))
+
+
+
+(add-hook 'minibuffer-setup-hook
+          (lambda ()
+            (make-local-variable 'face-remapping-alist)
+            (add-to-list 'face-remapping-alist '(default (:background "green")))))
+
+
+
+
+;;; map C-W in minibuffer to delete word before cussor
+
+
+
+;(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")
+;(evil-escape-mode 1)