Update to Emacs 24

.emacs.d/init.el

@@ -21,6 +21,7 @@
  '(c-label-offset -4)
  '(fast-lock-cache-directories (quote ("~/flc-cache")))
  '(fast-lock-minimum-size nil)
+ '(fill-column 120)
  '(find-file-run-dired t)
  '(font-lock-global-modes t)
  '(font-lock-maximum-size nil)
@@ -174,6 +175,7 @@
 ;; Text mode configuration.
 ;; =================================================================
 (defun my-text-mode-hook ()
+  (setq fill-column 70)
   (turn-on-auto-fill)
   (flyspell-mode))
 
@@ -494,3 +496,14 @@
 (autoload 'lua-mode "lua-mode" "Lua editing mode." t)
 (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode))
 (add-to-list 'interpreter-mode-alist '("lua" . lua-mode))
+
+;; Column markers
+(require 'column-marker)
+
+(custom-set-faces
+  ;; custom-set-faces was added by Custom.
+  ;; If you edit it by hand, you could mess it up, so be careful.
+  ;; Your init file should contain only one such instance.
+  ;; If there is more than one, they won't work right.
+ )
+