From 3388972c26b573beababdcbc777fb172f4d2bc11 Mon Sep 17 00:00:00 2001 From: beyondpie Date: Sat, 8 Aug 2020 01:35:25 -0400 Subject: [PATCH] [ESS] Fix: remove obsolete variables in ESS (#13826) * [ESS] Fix: remove obsolete variables in ESS - use ess-offset-continued to replace the obsolete variables (from ESS 15.04): ess-first-continued-statement-offset ess-continued-statement-offset - remove ess-expression-offset no such variable now * [ESS] fix: keep ess-default-style instead of ess-style - keep the original ess-default-style instead of ess-style since ess-default-style will be obsolete till ESS 19.04 while current ESS version is 18.10 --- layers/+lang/ess/packages.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/layers/+lang/ess/packages.el b/layers/+lang/ess/packages.el index ac4b930aa..baf1d22e1 100644 --- a/layers/+lang/ess/packages.el +++ b/layers/+lang/ess/packages.el @@ -70,10 +70,7 @@ :init (progn (setq ess-use-company nil - ;; Follow Hadley Wickham's R style guide - ess-first-continued-statement-offset 2 - ess-continued-statement-offset 0 - ess-expression-offset 2 + ess-offset-continued 'straight ess-nuke-trailing-whitespace-p t ess-default-style 'DEFAULT)