 (setq ispell-program-name "/usr/bin/aspell"
       ispell-list-command "--list")
 
-(let* ((langs '("american" "francais"))
-      (lang-ring (make-ring (length langs))))
-  (dolist (elem langs) (ring-insert lang-ring elem))
-
-  (defun ispell-cycle-languages ()
-    (interactive)
-    (let ((lang (ring-ref lang-ring -1)))
-      (ring-insert lang-ring lang)
-      (ispell-change-dictionary lang))))
+(let ((langs '("american" "francais")))
+  (setq lang-ring (make-ring (length langs)))
+  (dolist (elem langs) (ring-insert lang-ring elem)))
+
+(defun ispell-cycle-languages ()
+  (interactive)
+  (let ((lang (ring-ref lang-ring -1)))
+    (ring-insert lang-ring lang)
+    (ispell-change-dictionary lang)))
 
 (defun flyspell-check-next-highlighted-word ()
-    "Custom function to spell check next highlighted word"
-    (interactive)
-    (flyspell-goto-next-error)
-    (ispell-word))
+  "Custom function to spell check next highlighted word"
+  (interactive)
+  (flyspell-goto-next-error)
+  (ispell-word))
 
 (add-hook 'prog-mode-hook 'flyspell-prog-mode)
 (add-hook 'text-mode-hook 'flyspell-mode)

    (ediff-merge-files-with-ancestor file1 file2 file3 nil file4)))

(add-to-list 'command-switch-alist '("merge" . command-line-merge))

(require 'flx-ido)
;(ido-mode 1)


(require 'projectile)
(projectile-global-mode)

;; Override some projectile keymaps
(eval-after-load 'projectile
