From 5803d30af6ffbbb24009bd36a78c0fb4255a4e57 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@tradeo.com>
Date: Wed, 6 Mar 2013 21:43:59 +0200
Subject: [PATCH] Clean up the modeline a bit with diminish.el

---
 core/prelude-editor.el        |  3 +++
 core/prelude-mode.el          |  2 +-
 core/prelude-packages.el      |  2 +-
 modules/prelude-emacs-lisp.el | 11 ++++++++++-
 modules/prelude-lisp.el       |  3 +++
 modules/prelude-ruby.el       |  4 +---
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/core/prelude-editor.el b/core/prelude-editor.el
index 97dfcc6..1f17bc8 100644
--- a/core/prelude-editor.el
+++ b/core/prelude-editor.el
@@ -171,6 +171,7 @@
 
 (require 'volatile-highlights)
 (volatile-highlights-mode t)
+(diminish 'volatile-highlights-mode)
 
 ;; note - this should be after volatile-highlights is required
 ;; add the ability to copy and cut the current line, without marking it
@@ -252,6 +253,7 @@
 (require 'projectile)
 (setq projectile-cache-file (expand-file-name  "projectile.cache" prelude-savefile-dir))
 (projectile-global-mode t)
+(diminish 'projectile-mode "Prjl")
 
 (require 'helm-misc)
 (require 'helm-projectile)
@@ -352,6 +354,7 @@ indent yanked text (with prefix arg don't indent)."
 
 ;; sensible undo
 (global-undo-tree-mode)
+(diminish 'undo-tree-mode)
 
 ;; enable winner-mode to manage window configurations
 (winner-mode +1)
diff --git a/core/prelude-mode.el b/core/prelude-mode.el
index 54b4513..9d037ac 100644
--- a/core/prelude-mode.el
+++ b/core/prelude-mode.el
@@ -110,7 +110,7 @@
   "Minor mode to consolidate Emacs Prelude extensions.
 
 \\{prelude-mode-map}"
-  :lighter " Prelude"
+  :lighter " Pre"
   :keymap prelude-mode-map
   (if prelude-mode
       ;; on start
diff --git a/core/prelude-packages.el b/core/prelude-packages.el
index 5d1f3e6..d5f6a0e 100644
--- a/core/prelude-packages.el
+++ b/core/prelude-packages.el
@@ -40,7 +40,7 @@
 (package-initialize)
 
 (defvar prelude-packages
-  '(ace-jump-mode ack-and-a-half elisp-slime-nav exec-path-from-shell
+  '(ace-jump-mode ack-and-a-half diminish elisp-slime-nav exec-path-from-shell
                   expand-region flycheck gist
                   git-commit-mode gitconfig-mode gitignore-mode
                   guru-mode helm helm-projectile
diff --git a/modules/prelude-emacs-lisp.el b/modules/prelude-emacs-lisp.el
index 1e5b8b2..8bc9902 100644
--- a/modules/prelude-emacs-lisp.el
+++ b/modules/prelude-emacs-lisp.el
@@ -58,7 +58,8 @@
   (run-hooks 'prelude-lisp-coding-hook)
   (turn-on-eldoc-mode)
   (prelude-remove-elc-on-save)
-  (rainbow-mode +1))
+  (rainbow-mode +1)
+  (setq mode-name "EL"))
 
 (setq prelude-emacs-lisp-mode-hook 'prelude-emacs-lisp-mode-defaults)
 
@@ -75,6 +76,14 @@
 (add-hook 'ielm-mode-hook (lambda () (run-hooks 'prelude-ielm-mode-hook)))
 
 (define-key emacs-lisp-mode-map (kbd "M-.") 'find-function-at-point)
+
+(eval-after-load "elisp-slime-nav"
+  '(diminish 'elisp-slime-nav-mode))
+(eval-after-load "rainbow-mode"
+  '(diminish 'rainbow-mode))
+(eval-after-load "eldoc"
+  '(diminish 'eldoc-mode))
+
 (provide 'prelude-emacs-lisp)
 
 ;;; prelude-emacs-lisp.el ends here
diff --git a/modules/prelude-lisp.el b/modules/prelude-lisp.el
index 2d5803a..b00f37f 100644
--- a/modules/prelude-lisp.el
+++ b/modules/prelude-lisp.el
@@ -53,6 +53,9 @@
 
 (setq prelude-interactive-lisp-coding-hook 'prelude-interactive-lisp-coding-defaults)
 
+(eval-after-load "paredit"
+  '(diminish 'paredit-mode " π"))
+
 (provide 'prelude-lisp)
 
 ;;; prelude-lisp.el ends here
diff --git a/modules/prelude-ruby.el b/modules/prelude-ruby.el
index 953b4ab..7b781c0 100644
--- a/modules/prelude-ruby.el
+++ b/modules/prelude-ruby.el
@@ -33,9 +33,8 @@
 ;;; Code:
 
 (require 'prelude-programming)
-(prelude-ensure-module-deps '(ruby-tools inf-ruby yari ruby-end ruby-block))
+(prelude-ensure-module-deps '(ruby-tools inf-ruby yari ruby-end))
 
-(require 'ruby-block)
 ;; Rake files are ruby, too, as are gemspecs, rackup files, and gemfiles.
 (add-to-list 'auto-mode-alist '("\\.rake\\'" . ruby-mode))
 (add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
@@ -59,7 +58,6 @@
        (inf-ruby-setup-keybindings)
        ;; turn off the annoying input echo in irb
        (setq comint-process-echoes t)
-       (ruby-block-mode t)
        (ruby-end-mode +1)
        (ruby-tools-mode +1)
        ;; CamelCase aware editing operations