X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=0bd61bda77d52b0dadf20547dc81acde3738e255;hb=28314b1d7d65f2fc8e97f256e1d9783f5b59d8b8;hp=474f299ea0d137728fb93b4800d9e439b0011734;hpb=37b58ca1d2997368c1e4e2b240d1316814f16c0b;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 474f299..0bd61bd 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -503,9 +503,11 @@ Fix the issue in mode line when showing triangle
 
 set height in mode line
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (custom-set-variables
-   '(powerline-height 14)
-   '(powerline-text-scale-factor (/ (float 100) 140)))
+  (set-variable 'powerline-height 14)
+  (set-variable 'powerline-text-scale-factor (/ (float 100) 140))
+  ;; (custom-set-variables
+  ;;  '(powerline-height 14)
+  ;;  '(powerline-text-scale-factor (/ (float 100) 140)))
   ;; 100/140;0.8
   (set-face-attribute 'mode-line nil :height 100)
 #+END_SRC
@@ -892,14 +894,18 @@ Occur search key bindings
   (ivy-mode 1)
   (setq ivy-use-virtual-buffers t)
   (global-set-key (kbd "s-/") 'swiper)
+
+  (use-package counsel
+    :ensure t
+    :defer t)
   ;;* 
   ;; (global-set-key "\C-s" 'swiper)
   ;; (global-set-key (kbd "C-c C-r") 'ivy-resume)
   ;; (global-set-key (kbd "<f6>") 'ivy-resume)
-  ;; ;; (global-set-key (kbd "M-x") 'counsel-M-x)
+  (global-set-key (kbd "M-x") 'counsel-M-x)
   ;; ;; (global-set-key (kbd "C-x C-f") 'counsel-find-file)
-  ;; (global-set-key (kbd "<f1> f") 'counsel-describe-function)
-  ;; (global-set-key (kbd "<f1> v") 'counsel-describe-variable)
+  (global-set-key (kbd "C-h f") 'counsel-describe-function)
+  (global-set-key (kbd "C-h v") 'counsel-describe-variable)
   ;; (global-set-key (kbd "<f1> l") 'counsel-load-library)
   ;; (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
   ;; (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
@@ -909,6 +915,11 @@ Occur search key bindings
   ;; (global-set-key (kbd "C-x l") 'counsel-locate)
   ;; (global-set-key (kbd "C-S-o") 'counsel-rhythmbox)
   ;; ;; (define-key read-expression-map (kbd "C-r") 'counsel-expression-history)
+
+  (set-face-attribute
+   'ivy-current-match nil
+   :background "Orange"
+   :foreground "black")
 #+END_SRC
 
 *** =M-s= prefix
@@ -2330,6 +2341,16 @@ Use =gnuplot= on =Org-mode= file, see [[http://orgmode.org/worg/org-contrib/babe
 - passion
 - vision
 - mission
+* Ediff
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load 'ediff
+    (setq ediff-split-window-function 'split-window-horizontally)
+    (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+    (add-hook 'ediff-startup-hook 'ediff-toggle-wide-display)
+    (add-hook 'ediff-cleanup-hook 'ediff-toggle-wide-display)
+    (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display))
+#+END_SRC
+
 * TODO Convert ASCII to key
 ** map =function-key-map= [[http://academic.evergreen.edu/projects/biophysics/technotes/program/ascii_ctrl.htm][ascii_ctrl]]
 new file =C-x C-f C-f=
@@ -2344,8 +2365,21 @@ new file =C-x C-f C-f=
 
 * TODO imenu bindings
 
-* TODO modified indicator 
-* TODO highlight selected ido candicate
-* TODO show time in right of mode-line
-* TODO ediff mode
+* DONE modified indicator
+:LOGBOOK:
+- State "DONE"       from "TODO"       [2016-07-18 Mon 23:35]
+:END:
+* DONE highlight selected ido candicate
+:LOGBOOK:
+- State "DONE"       from "TODO"       [2016-07-19 Tue 01:49]
+:END:
+* DONE show time in right of mode-line
+:LOGBOOK:
+- State "DONE"       from "TODO"       [2016-07-19 Tue 01:11]
+:END:
+* DONE ediff mode
+:LOGBOOK:
+- State "DONE"       from "TODO"       [2016-07-19 Tue 01:11]
+:END:
 * TODO jump last change point
+* TODO emms mode-line