From 6f17aaee8d4e88db54d27ff8d59ab6c9a5935f78 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 20 Sep 2016 08:26:06 +0200
Subject: Emacs: Replace helm history commands with counsel

---
 tag-emacs/emacs.d/init.org | 60 +++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index f1011e8..76743a6 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -1198,8 +1198,8 @@ Occasionally, I exit emacs.  I should probably reduce the frequency of this.
 
 ** swiper/ivy
 
-Ivy is the new kid on the completion block.  I wonder if it can
-replace helm and ido.
+Ivy is the new kid on the completion block.  It seems to be a strong
+replacement for helm so far.
 
 #+BEGIN_SRC emacs-lisp
   (use-package swiper
@@ -2026,28 +2026,28 @@ nice, when I remember to use it.
 
 #+BEGIN_SRC emacs-lisp
   (use-package eshell
-    :bind ("C-c s" .  eshell)
-    :config (progn
-              (setq eshell-directory-name "~/.emacs.d/eshell")
-              (add-hook 'eshell-load-hook (lambda ()
-                                            (bind-key "C-c C-l" #'helm-eshell-history eshell-mode-map)))))
+	:bind ("C-c s" .  eshell)
+	:config (progn
+			  (setq eshell-directory-name "~/.emacs.d/eshell")
+			  (add-hook 'eshell-load-hook (lambda ()
+											(bind-key "C-c C-l" #'counsel-esh-history eshell-mode-map)))))
 
   (use-package em-smart
-    :ensure nil
-    :commands eshell-smart-initialize
-    :init (progn
-            (add-hook 'eshell-load-hook #'eshell-smart-initialize))
-    :config (progn
-              (setq eshell-where-to-jump 'begin
-                    eshell-review-quick-commands nil
-                    eshell-smart-space-goes-to-end t)))
+	:ensure nil
+	:commands eshell-smart-initialize
+	:init (progn
+			(add-hook 'eshell-load-hook #'eshell-smart-initialize))
+	:config (progn
+			  (setq eshell-where-to-jump 'begin
+					eshell-review-quick-commands nil
+					eshell-smart-space-goes-to-end t)))
 
   (autoload #'eshell/cd "em-dirs")
   (defun eshell-goto-current-dir (&optional arg)
-    (interactive "P")
-    (let ((dir default-directory))
-      (eshell arg)
-      (eshell/cd dir)))
+	(interactive "P")
+	(let ((dir default-directory))
+	  (eshell arg)
+	  (eshell/cd dir)))
   (bind-key "C-c S" #'eshell-goto-current-dir)
 
 
@@ -2057,21 +2057,21 @@ nice, when I remember to use it.
 
 #+BEGIN_SRC emacs-lisp
   (use-package shell
-    :defer t
-    :ensure nil
-    :config (define-key shell-mode-map
-              (kbd "C-d") 'comint-delchar-or-eof-or-kill-buffer))
+	:defer t
+	:ensure nil
+	:config (define-key shell-mode-map
+			  (kbd "C-d") 'comint-delchar-or-eof-or-kill-buffer))
 
   (use-package comint
-    :defer t
-    :ensure nil
-    :config (bind-key "C-c C-l" #'helm-comint-input-ring comint-mode-map))
+	:defer t
+	:ensure nil
+	:config (bind-key "C-c C-l" #'counsel-shell-history comint-mode-map))
 
   (defun comint-delchar-or-eof-or-kill-buffer (arg)
-    (interactive "p")
-    (if (null (get-buffer-process (current-buffer)))
-        (kill-buffer)
-      (comint-delchar-or-maybe-eof arg)))
+	(interactive "p")
+	(if (null (get-buffer-process (current-buffer)))
+		(kill-buffer)
+	  (comint-delchar-or-maybe-eof arg)))
 #+END_SRC
 
 * Text editing
-- 
cgit 1.4.1