From cf059895f95c28b32a5fbb11b7f5726611d338cc Mon Sep 17 00:00:00 2001 From: kj Date: Wed, 29 Jun 2022 20:52:39 -0400 Subject: [PATCH] Change lsp for html/php switching and set counsel-register. --- configs/base-ivy.el | 1 + configs/base-lsp.el | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/configs/base-ivy.el b/configs/base-ivy.el index c1be992..4d396de 100644 --- a/configs/base-ivy.el +++ b/configs/base-ivy.el @@ -31,6 +31,7 @@ ([remap insert-char] . counsel-unicode-char) ([remap recentf-open-files] . counsel-recentf) ([remap org-capture] . counsel-org-capture) + ([remap jump-to-register] . counsel-register) ("C-c c B" . counsel-bookmarked-directory) ("C-c c F" . counsel-faces) diff --git a/configs/base-lsp.el b/configs/base-lsp.el index 9a2eeb3..e72e7db 100644 --- a/configs/base-lsp.el +++ b/configs/base-lsp.el @@ -23,6 +23,7 @@ :hook ((prog-mode . (lambda () (unless (derived-mode-p 'emacs-lisp-mode 'lisp-mode 'makefile-mode) (lsp-deferred)))) + (html-mode . lsp-deferred) (markdown-mode . lsp-deferred) (lsp-mode . lsp-enable-which-key-integration)) :custom @@ -50,6 +51,10 @@ lsp-enable-on-type-formatting nil) :config (with-no-warnings + ;; Remove php extension on form lsp + (setq lsp-language-id-configuration + (remove '(".*\\.php$" . "php") lsp-language-id-configuration)) + ;; Disable `lsp-mode' in `git-timemachine-mode' (defun my-lsp--init-if-visible (fn &rest args) (unless (bound-and-true-p git-timemachine-mode)