From 8f622e6beaf82701176c3e382ba92a65b1fd1f67 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 30 Sep 2014 16:35:53 -0400
Subject: [PATCH] Cleanup; and enable auto-completion

---
 init/init-ac.el    | 4 ++--
 init/init-text.el  | 6 +-----
 init/my-keymaps.el | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/init/init-ac.el b/init/init-ac.el
index 6a156d483..2e9f057b8 100644
--- a/init/init-ac.el
+++ b/init/init-ac.el
@@ -7,10 +7,10 @@
   (progn
     (require 'auto-complete-config)
 
-    (setq ac-auto-start nil
+    (setq ac-auto-start t
           ac-auto-show-menu t        ; Suggestions box must be invoked manually (see core-keymaps.el)
           ac-use-menu-map t          ; Enable ac-menu-map map when menu is open
-          ac-use-quick-help nil       ; Don't show tooltips unless invoked (see core-keymaps.el)
+          ac-use-quick-help t        ; Don't show tooltips unless invoked (see core-keymaps.el)
           ac-use-fuzzy nil
           ac-candidate-limit 25)
     (setq ac-comphist-file (concat *tmp-dir "ac-comphist.dat"))
diff --git a/init/init-text.el b/init/init-text.el
index 2f3c99118..5d3c6e877 100644
--- a/init/init-text.el
+++ b/init/init-text.el
@@ -5,13 +5,9 @@
          ("/README\\'" . markdown-mode))
   :pre-load
   (progn
+    ;; Implement strike-through formatting
     (defvar markdown-regex-del "\\(^\\|[^\\]\\)\\(\\(~\\{2\\}\\)\\([^ \n	\\]\\|[^ \n	]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(\\3\\)\\)")
     (defun markdown-insert-del ()
-      "Insert markup to make a region or word bold.
-            If there is an active region, make the region bold.  If the point
-            is at a non-bold word, make the word bold.  If the point is at a
-            bold word or phrase, remove the bold markup.  Otherwise, simply
-            insert bold delimiters and place the cursor in between them."
       (interactive)
       (let ((delim "~~"))
         (if (markdown-use-region-p)
diff --git a/init/my-keymaps.el b/init/my-keymaps.el
index 54ba56c38..d66056d27 100644
--- a/init/my-keymaps.el
+++ b/init/my-keymaps.el
@@ -165,7 +165,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; Real go-to-definition for elisp
-(nmap emacs-lisp-mode-map "gd"
+(mmap emacs-lisp-mode-map "gd"
       (λ (let ((func (function-called-at-point)))
            (if func (find-function func)))))
 
@@ -183,7 +183,7 @@
              (kbd "<tab>") 'ac-complete
              (kbd "C-n") 'ac-next
              (kbd "C-p") 'ac-previous
-             (kbd "<F1>") 'ac-quick-help
+             (kbd "S-C-SPC") 'ac-quick-help
              (kbd "ESC") 'ac-stop
              (kbd "RET") 'ac-complete))