From 98162094843f68cb0b562b07163804c1db90515f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 27 Feb 2020 11:29:50 -0500 Subject: [PATCH] Fix wrong-type-arg errors in ediff+web-mode buffers --- modules/lang/javascript/config.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index 0fdff1030..96e21d21a 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -148,7 +148,8 @@ If LSP fails to start (e.g. no available server or project), then we fall back to tide." (let ((buffer-file-name (buffer-file-name (buffer-base-buffer)))) (when (or (derived-mode-p 'js-mode 'typescript-mode) - (and (eq major-mode 'web-mode) + (and buffer-file-name + (eq major-mode 'web-mode) (string= "tsx" (file-name-extension buffer-file-name)))) (if (not buffer-file-name) ;; necessary because `tide-setup' and `lsp' will error if not a