summaryrefslogtreecommitdiffstats
path: root/emacs/.emacs.d/init.el
diff options
context:
space:
mode:
authorGravatar Tom Willemse2015-12-16 22:47:43 +0100
committerGravatar Tom Willemse2015-12-16 22:47:43 +0100
commit3c71390a267c56fa33f5df9f93d0693038a064d8 (patch)
tree3f2cbb51fef15b35b0a9f9c81c65e4b688dd9097 /emacs/.emacs.d/init.el
parent7888c07c0a2d40cbad25b4817c5b831a81992bd3 (diff)
downloaddotfiles-3c71390a267c56fa33f5df9f93d0693038a064d8.tar.gz
dotfiles-3c71390a267c56fa33f5df9f93d0693038a064d8.zip
Move SQL functions to separate library
Diffstat (limited to 'emacs/.emacs.d/init.el')
-rw-r--r--emacs/.emacs.d/init.el14
1 files changed, 4 insertions, 10 deletions
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)