fix git and company case

swarnendubiswas · Jan 9, 2017 · e6e4fb1 · e6e4fb1
1 parent 1d7ff34
commit e6e4fb1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/extras/abbrev_defs b/extras/abbrev_defs
@@ -47,7 +47,9 @@
 
 (define-abbrev-table 'ag-mode-abbrev-table '())
 
-(define-abbrev-table 'awk-mode-abbrev-table '())
+(define-abbrev-table 'awk-mode-abbrev-table
+  '(
+   ))
 
 (define-abbrev-table 'biblio-selection-mode-abbrev-table '())
 
@@ -63,9 +65,13 @@
 
 (define-abbrev-table 'bsh-script-mode-abbrev-table '())
 
-(define-abbrev-table 'c++-mode-abbrev-table '())
+(define-abbrev-table 'c++-mode-abbrev-table
+  '(
+   ))
 
-(define-abbrev-table 'c-mode-abbrev-table '())
+(define-abbrev-table 'c-mode-abbrev-table
+  '(
+   ))
 
 (define-abbrev-table 'calendar-mode-abbrev-table '())
 
@@ -536,6 +542,7 @@
     ("embarass" "embarrass" nil 0)
     ("emigre" "emigre" nil 0)
     ("enahancements" "enhancements" nil 0)
+    ("enegery" "energy" nil 1)
     ("enforece" "enforce" nil 1)
     ("english" "English" nil 0)
     ("engouh" "enough" nil 1)
@@ -1318,7 +1325,9 @@
 
 (define-abbrev-table 'ivy-occur-mode-abbrev-table '())
 
-(define-abbrev-table 'java-mode-abbrev-table '())
+(define-abbrev-table 'java-mode-abbrev-table
+  '(
+   ))
 
 (define-abbrev-table 'jdee-mode-abbrev-table
   '(
@@ -1360,7 +1369,9 @@
 
 (define-abbrev-table 'messages-buffer-mode-abbrev-table '())
 
-(define-abbrev-table 'objc-mode-abbrev-table '())
+(define-abbrev-table 'objc-mode-abbrev-table
+  '(
+   ))
 
 (define-abbrev-table 'occur-edit-mode-abbrev-table '())
 
@@ -1382,7 +1393,9 @@
 
 (define-abbrev-table 'pdf-occur-buffer-mode-abbrev-table '())
 
-(define-abbrev-table 'pike-mode-abbrev-table '())
+(define-abbrev-table 'pike-mode-abbrev-table
+  '(
+   ))
 
 (define-abbrev-table 'plain-tex-mode-abbrev-table '())
 

diff --git a/modules/company-init.el b/modules/company-init.el
@@ -28,8 +28,9 @@
         company-tooltip-align-annotations t
         company-tooltip-limit 20
         company-selection-wrap-around t
-        ;; company-dabbrev-downcase nil ; Do not downcase the returned candidates
-        ;; company-dabbrev-code-everywhere t ; Offer completions in comments and strings
+        company-dabbrev-downcase nil ; Do not downcase the returned candidates
+        company-dabbrev-ignore-case t
+        company-dabbrev-code-everywhere t ; Offer completions in comments and strings
         ;; ;; https://github.com/company-mode/company-mode/wiki/Switching-from-AC
         ;; company-begin-commands '(self-insert-command)
         ;; https://github.com/company-mode/company-mode/issues/123

diff --git a/modules/git-init.el b/modules/git-init.el
@@ -9,7 +9,8 @@
 
 (use-package magit
   :ensure t
-  :if (unless (string-equal (system-name) "consensus.ices.utexas.edu")) ; Magit needs git >=1.9.4
+  :if (and (eq system-type 'gnu/linux) (unless (string-equal (system-name) "consensus.ices.utexas.edu"))) ; Magit needs
+                                        ; git >=1.9.4
   :config
   (setq magit-auto-revert-mode nil
         magit-item-highlight-face 'bold)