Merge branch 'master' of https://git.cloudsphere.duckdns.org/marc/config_emacs

config.org

@@ -1461,18 +1461,22 @@ Maybe add [[https://github.com/hlissner/emacs-company-dict][company-dict]]? It's
    TODO: yas-minor-mode? what's that?
 
 #+BEGIN_SRC emacs-lisp
-    (use-package yasnippet
-      :ensure t
-      :defer t
-      :diminish yas-minor-mode
-      :init
-      (yas-global-mode t)
-      (setq yas-snippet-dirs (concat PATH_USER_GLOBAL "snippets"))
-      :mode ("\\.yasnippet" . snippet-mode)
-      :config
-      (yas-reload-all) ;; ensure snippets are updated and available, necessary when not using global-mode
-    )
+(use-package yasnippet
+  :ensure t
+  :defer t
+  :diminish yas-minor-mode
+  :init
+  (yas-global-mode t)
+  (setq yas-snippet-dirs (concat PATH_USER_GLOBAL "snippets"))
+  :mode ("\\.yasnippet" . snippet-mode)
+  :config
+  (unless (string-equal my/whoami "work_remote")  ; very hacky, but yas-reload-all throws a wrongp error at work
+    (yas-reload-all)) ;; ensure snippets are updated and available, necessary when not using global-mode
+)
 #+END_SRC
+
+#+RESULTS:
+
 ** Lisp
 
    Not sure about this one, but dynamic binding gets some bad vibes.

user-global/abbrev_defs

@@ -37,10 +37,13 @@
     ("`va" "\\value" nil 0)
    ))
 
+<<<<<<< HEAD
 (define-abbrev-table 'awk-mode-abbrev-table
   '(
    ))
 
+=======
+>>>>>>> 0336616e900104ef59b50bd73e7cd6755ba40cd8
 (define-abbrev-table 'bibtex-mode-abbrev-table '())
 
 (define-abbrev-table 'bookmark-bmenu-mode-abbrev-table '())
@@ -63,6 +66,8 @@
 
 (define-abbrev-table 'completion-list-mode-abbrev-table '())
 
+(define-abbrev-table 'debugger-mode-abbrev-table '())
+
 (define-abbrev-table 'diff-mode-abbrev-table '())
 
 (define-abbrev-table 'dig-mode-abbrev-table '())
@@ -75,12 +80,27 @@
 
 (define-abbrev-table 'emacs-lisp-mode-abbrev-table '())
 
+<<<<<<< HEAD
 (define-abbrev-table 'eshell-mode-abbrev-table '())
+=======
+(define-abbrev-table 'epa-info-mode-abbrev-table '())
+
+(define-abbrev-table 'epa-key-list-mode-abbrev-table '())
+
+(define-abbrev-table 'epa-key-mode-abbrev-table '())
+>>>>>>> 0336616e900104ef59b50bd73e7cd6755ba40cd8
 
 (define-abbrev-table 'evil-command-window-mode-abbrev-table '())
 
 (define-abbrev-table 'evil-list-view-mode-abbrev-table '())
 
+<<<<<<< HEAD
+=======
+(define-abbrev-table 'flycheck-error-list-mode-abbrev-table '())
+
+(define-abbrev-table 'flymake-diagnostics-buffer-mode-abbrev-table '())
+
+>>>>>>> 0336616e900104ef59b50bd73e7cd6755ba40cd8
 (define-abbrev-table 'fundamental-mode-abbrev-table '())
 
 (define-abbrev-table 'global-abbrev-table '())
@@ -165,10 +185,13 @@
 
 (define-abbrev-table 'text-mode-abbrev-table '())
 
+<<<<<<< HEAD
 (define-abbrev-table 'url-cookie-mode-abbrev-table '())
 
 (define-abbrev-table 'use-package-statistics-mode-abbrev-table '())
 
+=======
+>>>>>>> 0336616e900104ef59b50bd73e7cd6755ba40cd8
 (define-abbrev-table 'vc-git-log-edit-mode-abbrev-table '())
 
 (define-abbrev-table 'vc-git-log-view-mode-abbrev-table '())