Merge pull request #794 from vikigenius/ess-fix

Fixed ess main load point

modules/lang/ess/config.el

@@ -1,6 +1,6 @@
 ;;; lang/ess/config.el -*- lexical-binding: t; -*-
 
-(def-package! ess-site
+(def-package! ess-mode
   :commands (R stata julia SAS)
   :mode (("\\.sp\\'"           . S-mode)
          ("/R/.*\\.q\\'"       . R-mode)
@@ -30,6 +30,7 @@
          ("\\.[Jj][Oo][Gg]\\'" . ess-jags-mode)
          ("\\.[Jj][Mm][Dd]\\'" . ess-jags-mode))
   :init
+  (setq ess-smart-S-assign-key nil)
   (unless (featurep! :lang julia)
     (add-to-list 'auto-mode-alist '("\\.jl\\'" . ess-julia-mode)))
   :config
@@ -38,7 +39,6 @@
         ess-expression-offset 2
         ess-nuke-trailing-whitespace-p t
         ess-default-style 'DEFAULT)
-  (ess-toggle-underscore t)
   (set-repl-handler! 'ess-mode #'+ess/r-repl)
   (set-lookup-handlers! 'ess-mode :documentation #'ess-display-help-on-object)
   (define-key! ess-doc-map
@@ -78,8 +78,3 @@
         :n "cm"        #'ess-noweb-mark-chunk
         :n "cp"        #'ess-noweb-previous-chunk
         :n "cn"        #'ess-noweb-next-chunk))
-
-
-;; `ess-smart-equals-mode'
-(add-hook! '(ess-mode-hook inferior-ess-hook)
-  #'ess-smart-equals-mode)

modules/lang/ess/packages.el

@@ -2,5 +2,4 @@
 ;;; lang/ess/packages.el
 
 (package! ess)
-(package! ess-smart-equals)
 (package! ess-R-data-view)