branch: elpa/powershell
commit 99e0e73082fd48314a9825254dac45f318e5bb59
Merge: 9efa1b4d0a3 29e3a9506e4
Author: Jürgen Hötzel <[email protected]>
Commit: GitHub <[email protected]>

    Merge pull request #45 from juergenhoetzel/fix-autoload
    
    Remove autoloaded registration of language server in Eglot
---
 powershell.el | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/powershell.el b/powershell.el
index 68d60c70181..246ad6b0b73 100644
--- a/powershell.el
+++ b/powershell.el
@@ -790,7 +790,9 @@ that value is non-nil."
   (powershell-setup-imenu)
   (powershell-setup-speedbar)
   (powershell-setup-menu)
-  (powershell-setup-eldoc))
+  (powershell-setup-eldoc)
+  (with-eval-after-load 'eglot
+    (powershell--register-langserver)))
 
 ;;; PowerShell inferior mode
 
@@ -1433,7 +1435,6 @@ This insures we get and display the prompt."
   (powershell--download-langserver)
   (powershell--register-langserver))
 
-;;;###autoload
 (defun powershell--register-langserver ()
   (defvar eglot-server-programs)
   (let* ((langserver-path (powershell-langserver-file-name))
@@ -1458,10 +1459,6 @@ This insures we get and display the prompt."
   (car (file-expand-wildcards
         (substitute-in-file-name powershell-default-langserver-path))))
 
-;;;###autoload
-(with-eval-after-load 'eglot
-  (powershell--register-langserver))
-
 (provide 'powershell)
 
 ;;; powershell.el ends here

Reply via email to