From 3c71390a267c56fa33f5df9f93d0693038a064d8 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Wed, 16 Dec 2015 22:47:43 +0100
Subject: Move SQL functions to separate library

---
 emacs/.emacs.d/init.el | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'emacs/.emacs.d/init.el')

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index e13c78b..056fee9 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -137,15 +137,6 @@ MODE1 is enabled and vice-versa."
 
 ;;;; Functions
 
-(defun oni:augment-sql-prompt ()
-  "Add the MariaDB prompt to the `sql-prompt-regexp'."
-  (if (eq sql-product 'mysql)
-      (setq sql-prompt-regexp
-            (rx (and line-start
-                     (or "mysql"
-                         (and "MariaDB [" (1+ nonl) "]"))
-                     "> ")))))
-
 (defun awesome-send (command)
   "Send COMMAND through awesome-client to awesome."
   (shell-command (format "echo '%s' | awesome-client" command)))
@@ -1105,7 +1096,10 @@ If no direction is given, don't split."
 (add-hook 'outline-minor-mode-hook #'oni:set-tab-maybe-toggle-outline)
 (add-hook 'scheme-mode-hook (lambda () (setq ac-sources '(ac-source-geiser))))
 (add-hook 'slime-mode-hook #'set-up-slime-ac)
-(add-hook 'sql-interactive-mode-hook #'oni:augment-sql-prompt)
+
+;; Support the prompt from MariaDB
+(add-hook 'sql-interactive-mode-hook 'oni:augment-sql-prompt)
+
 (add-hook 'term-mode-hook 'oni:term-mode-func)
 (add-hook 'vala-mode-hook #'oni:vala-mode-func)
 (add-hook 'write-file-hooks 'oni:write-file-func)
-- 
cgit v1.2.3-54-g00ecf