Add abbrevs to C, Java, and C# modes

1 files changed, 8 insertions, 2 deletions

diff --git a/oni-c.el b/oni-c.el
index cfa360d..bbe37c2 100644
--- a/oni-c.el
+++ b/oni-c.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0907.143822
+;; Version: 2020.1210.205244
 ;; Package-Requires: (oni-flycheck oni-fci)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -26,13 +26,16 @@
 
 ;;; Code:
 
+(require 'cc-mode)
+
 (defun oni-c--auto-fill-mode ()
   "Enable ‘auto-fill-mode’ only for comments."
   (setq-local comment-auto-fill-only-comments t)
   (auto-fill-mode))
 
-(add-hook 'c-mode-hook 'electric-pair-local-mode)
+(add-hook 'c-mode-hook 'abbrev-mode)
 (add-hook 'c-mode-hook 'electric-indent-local-mode)
+(add-hook 'c-mode-hook 'electric-pair-local-mode)
 (add-hook 'c-mode-hook 'flycheck-mode)
 (add-hook 'c-mode-hook 'oni-c--auto-fill-mode)
 
@@ -41,6 +44,9 @@
               'display-fill-column-indicator-mode
             'fci-mode))
 
+(define-abbrev c-mode-abbrev-table "and" "&&")
+(define-abbrev c-mode-abbrev-table "or" "||")
+
 ;;;###autoload(with-eval-after-load 'cc-mode (require 'oni-c))
 
 (provide 'oni-c)