From cf060eeec41d6b05739f40069c32a57d2a21c340 Mon Sep 17 00:00:00 2001 From: Adam B Date: Tue, 9 May 2023 20:20:37 -0400 Subject: [PATCH] Remove attempt to be smart with company completion This just causes issues as seen with https://github.com/JuliaEditorSupport/julia-emacs/issues/188#issuecomment-1536607753. If you're choosing to install a fairly dramatic departure from standard emacs completion like `company`, you can't expect things like `julia-mode` to go out of their way to accomodate the ways `company` breaks normal emacs completion. The alternative would be to instead manually check `tab-always-indent` within `julia--company-indent-for-tab-command`, but I still feel like this would cause more confusion than it cures. --- julia-mode.el | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/julia-mode.el b/julia-mode.el index cc81343..49bd5a8 100644 --- a/julia-mode.el +++ b/julia-mode.el @@ -908,24 +908,6 @@ buffer where the LaTeX symbol starts." (abbrev-insert symb name beg end))) #'ignore)) -;; company-mode doesn't work via `indent-for-tab-command'. In order to have a consistent -;; completion UI, we must dynamically choose between `company-indent-or-complete-common' and -;; `indent-for-tab-command' based on whether `company-mode' is active. First we need to -;; pacify the byte-compiler though. -(declare-function company-indent-or-complete-common "company") -(defvar company-mode) - -(defun julia--company-indent-for-tab-command (arg) - "Call `indent-for-tab-command' or `company-indent-or-complete-common'." - (interactive "P") - (if company-mode - (company-indent-or-complete-common arg) - (indent-for-tab-command arg))) - -(with-eval-after-load 'company - (define-key julia-mode-map [remap indent-for-tab-command] - #'julia--company-indent-for-tab-command)) - ;; Math insertion in julia. Use it with ;; (add-hook 'julia-mode-hook 'julia-math-mode) ;; (add-hook 'inferior-julia-mode-hook 'julia-math-mode)