diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-14 20:34:51 +0100 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-14 20:34:51 +0100 |
| commit | 9dbf985df5515f4b9b40a7dcf74f916fa8d57ee3 (patch) | |
| tree | 413c578cfb611cee88e380a57fd69a41ff642fc3 /editors/emacs/ra-emacs-lsp.el | |
| parent | 84b66107828365d02fd29641fe32b3c42f036864 (diff) | |
| parent | 882daf424576d59b0dd089aa5facc9d98ac0b9fd (diff) | |
Merge #1403
1403: Add alloc -> core dependency r=matklad a=flodiebold
Also a small fix for the ra-emacs-lsp company fix.
Co-authored-by: Florian Diebold <[email protected]>
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'editors/emacs/ra-emacs-lsp.el')
| -rw-r--r-- | editors/emacs/ra-emacs-lsp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/emacs/ra-emacs-lsp.el b/editors/emacs/ra-emacs-lsp.el index 71bc20f17..2ea106533 100644 --- a/editors/emacs/ra-emacs-lsp.el +++ b/editors/emacs/ra-emacs-lsp.el | |||
| @@ -81,7 +81,7 @@ | |||
| 81 | 81 | ||
| 82 | (with-eval-after-load 'company-lsp | 82 | (with-eval-after-load 'company-lsp |
| 83 | ;; company-lsp provides a snippet handler for rust by default that adds () after function calls, which RA does better | 83 | ;; company-lsp provides a snippet handler for rust by default that adds () after function calls, which RA does better |
| 84 | (setq company-lsp--snippet-functions (assq-delete-all "rust" company-lsp--snippet-functions))) | 84 | (setq company-lsp--snippet-functions (cl-delete "rust" company-lsp--snippet-functions :key #'car :test #'equal))) |
| 85 | 85 | ||
| 86 | ;; join lines | 86 | ;; join lines |
| 87 | 87 | ||