From 01e647112b3c574f3d66e6b4a0ffa5879a7f09fa Mon Sep 17 00:00:00 2001 From: Marc Pohling Date: Mon, 30 Jul 2018 10:49:58 +0200 Subject: [PATCH 1/2] disable yas-reload-all at work, because bug --- config.org | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/config.org b/config.org index 26ac075..57a518a 100644 --- a/config.org +++ b/config.org @@ -1455,18 +1455,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. From 0336616e900104ef59b50bd73e7cd6755ba40cd8 Mon Sep 17 00:00:00 2001 From: Marc Pohling Date: Mon, 30 Jul 2018 10:51:24 +0200 Subject: [PATCH 2/2] no idea where these changes came from --- user-global/abbrev_defs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/user-global/abbrev_defs b/user-global/abbrev_defs index d298300..3b5dcae 100644 --- a/user-global/abbrev_defs +++ b/user-global/abbrev_defs @@ -37,8 +37,6 @@ ("`va" "\\value" nil 0) )) -(define-abbrev-table 'beancount-mode-abbrev-table '()) - (define-abbrev-table 'bibtex-mode-abbrev-table '()) (define-abbrev-table 'bookmark-bmenu-mode-abbrev-table '()) @@ -51,6 +49,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 'edit-abbrevs-mode-abbrev-table '()) @@ -59,12 +59,20 @@ (define-abbrev-table 'emacs-lisp-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 '()) + (define-abbrev-table 'evil-command-window-mode-abbrev-table '()) (define-abbrev-table 'evil-list-view-mode-abbrev-table '()) (define-abbrev-table 'flycheck-error-list-mode-abbrev-table '()) +(define-abbrev-table 'flymake-diagnostics-buffer-mode-abbrev-table '()) + (define-abbrev-table 'fundamental-mode-abbrev-table '()) (define-abbrev-table 'global-abbrev-table '()) @@ -121,8 +129,6 @@ (define-abbrev-table 'treemacs-mode-abbrev-table '()) -(define-abbrev-table 'url-cookie-mode-abbrev-table '()) - (define-abbrev-table 'vc-git-log-edit-mode-abbrev-table '()) (define-abbrev-table 'vc-git-log-view-mode-abbrev-table '())