From 3fdca523394235270465eec1338898a6a1d176f8 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franckcuny@gmail.com>
Date: Sun, 16 Aug 2015 22:56:49 -0700
Subject: [emacs] delete init.el~

---
 emacs.d/init.el~ | 47 -----------------------------------------------
 gitignore        |  1 +
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 emacs.d/init.el~

diff --git a/emacs.d/init.el~ b/emacs.d/init.el~
deleted file mode 100644
index 6d513cb..0000000
--- a/emacs.d/init.el~
+++ /dev/null
@@ -1,47 +0,0 @@
-;; no menu
-(menu-bar-mode -1)
-
-;; show parenthesis
-(show-paren-mode +1)
-
-;; and lose the stupid pipe chars on the split-screen bar
-(set-face-foreground 'vertical-border "white")
-(set-face-background 'vertical-border "white")
-
-;; alias yes-or-no to y-or-n
-(fset 'yes-or-no-p 'y-or-n-p)
-
-;; set utf-8 as the default encoding
-(prefer-coding-system 'utf-8-unix)
-
-(autoload 'ibuffer "ibuffer" "List buffers." t)
-
-(require 'whitespace)
-(global-whitespace-mode 1)
-
-;;; set some variables
-;; add a new line at the end of the file
-(setq
- auto-save-default nil
- auto-save-list-file-prefix nil
- frame-title-format '(buffer-file-name "%f" ("%b"))
- inhibit-startup-message t
- make-backup-files nil
- require-final-newline t
- tab-always-indent 'complete
- vc-follow-symlinks t
- whitespace-style '(face trailing tabs))
-
-(setq-default indent-tabs-mode nil
-	      python-indent-offset 2
-	      sh-basic-offset 2
-	      sh-indentation 2)
-
-;;; some bindings
-(global-set-key (kbd "M-j") 'join-line)
-(global-set-key (kbd "C-x C-b") 'ibuffer)
-
-;;; if our version is >24 and we have the emacs24.el file, load it.
-(when (>= emacs-major-version 24)
-  (if (file-exists-p "emacs24.el")
-            (load "~/.emacs.d/emacs24.el")))
diff --git a/gitignore b/gitignore
index 0e13c9b..4bf4b03 100644
--- a/gitignore
+++ b/gitignore
@@ -8,3 +8,4 @@
 # ctags stuff
 TAGS
 tags
+.projectile
-- 
cgit 1.4.1