adapt layer to recent changes in ess
This commit is contained in:
parent
c2a351cac7
commit
23f3d3c313
|
@ -1131,6 +1131,7 @@ Benner and Paweł Siudak):
|
||||||
- Reorganize key bindings ( refer to =ESS= section in Breaking Changes above )
|
- Reorganize key bindings ( refer to =ESS= section in Breaking Changes above )
|
||||||
- Add =xref= integraton (thanks to Guido Kraemer)
|
- Add =xref= integraton (thanks to Guido Kraemer)
|
||||||
- Update ess-disable-underscore-assign for ESS 18.10 (thanks to Leonard Lausen)
|
- Update ess-disable-underscore-assign for ESS 18.10 (thanks to Leonard Lausen)
|
||||||
|
- Update layer with the latest upstream changes (thanks to Guido Kraemer)
|
||||||
**** Evil snipe
|
**** Evil snipe
|
||||||
- Must always explicitly enable =evil-snipe-mode= even when
|
- Must always explicitly enable =evil-snipe-mode= even when
|
||||||
=evil-snipe-override-mode= is enabled (thanks to Sylvain Benner)
|
=evil-snipe-override-mode= is enabled (thanks to Sylvain Benner)
|
||||||
|
|
|
@ -24,7 +24,6 @@ This layer adds support for statistical programming languages to Spacemacs.
|
||||||
- Syntax-checking via [[https://github.com/jimhester/lintr][lintr]]
|
- Syntax-checking via [[https://github.com/jimhester/lintr][lintr]]
|
||||||
- Additional data viewer for R via [[https://github.com/myuhe/ess-R-data-view.el][ess-R-data-view]]
|
- Additional data viewer for R via [[https://github.com/myuhe/ess-R-data-view.el][ess-R-data-view]]
|
||||||
- Support for Org-Babel
|
- Support for Org-Babel
|
||||||
- Better ’equals’ behavior via [[https://github.com/genovese/ess-smart-equals][ess-smart-equals]]
|
|
||||||
- Showing of inline help for =R= constructs
|
- Showing of inline help for =R= constructs
|
||||||
- Repl support via =R terminal=
|
- Repl support via =R terminal=
|
||||||
- Support for =S=, =SAS= and =R=
|
- Support for =S=, =SAS= and =R=
|
||||||
|
@ -43,21 +42,11 @@ To do so start the R terminal and type below code.
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
* Options
|
* Options
|
||||||
To turn off the automatic replacement of underscores by =<-=, set in your
|
Use a key-binding to insert =<-=:
|
||||||
=~/.spacemacs=:
|
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(setq-default dotspacemacs-configuration-layers '((ess :variables
|
(setq-default dotspacemacs-configuration-layers '((ess :variables
|
||||||
ess-disable-underscore-assign t)))
|
ess-assign-key "\M--")))
|
||||||
#+END_SRC
|
|
||||||
|
|
||||||
Alternatively you may enable =ess-smart-equals=, which also disables replacement
|
|
||||||
of underscores by =<-=, and additionally replace the equals sign with =<-= when
|
|
||||||
appropriate:
|
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
|
||||||
(setq-default dotspacemacs-configuration-layers '((ess :variables
|
|
||||||
ess-enable-smart-equals t)))
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
* Key bindings
|
* Key bindings
|
||||||
|
|
|
@ -11,8 +11,5 @@
|
||||||
|
|
||||||
;; Variables
|
;; Variables
|
||||||
|
|
||||||
(defvar ess-enable-smart-equals nil
|
(defvar ess-assign-key nil
|
||||||
"If non-nil smart-equal support is enabled")
|
"Call `ess-insert-assign'.")
|
||||||
|
|
||||||
(defvar ess-disable-underscore-assign nil
|
|
||||||
"If non-nil, disables underscore _ being a shortcut for assignment <-")
|
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
'(
|
'(
|
||||||
ess
|
ess
|
||||||
ess-R-data-view
|
ess-R-data-view
|
||||||
(ess-smart-equals :toggle ess-enable-smart-equals)
|
|
||||||
golden-ratio
|
golden-ratio
|
||||||
org
|
org
|
||||||
))
|
))
|
||||||
|
@ -57,7 +56,7 @@
|
||||||
(add-hook 'inferior-ess-mode-hook
|
(add-hook 'inferior-ess-mode-hook
|
||||||
'spacemacs//ess-fix-read-only-inferior-ess-mode)
|
'spacemacs//ess-fix-read-only-inferior-ess-mode)
|
||||||
(when (configuration-layer/package-used-p 'company)
|
(when (configuration-layer/package-used-p 'company)
|
||||||
(add-hook 'ess-mode-hook 'company-mode))))
|
(add-hook 'ess-r-mode-hook 'company-mode))))
|
||||||
|
|
||||||
;; R --------------------------------------------------------------------------
|
;; R --------------------------------------------------------------------------
|
||||||
(setq spacemacs/ess-config
|
(setq spacemacs/ess-config
|
||||||
|
@ -68,13 +67,12 @@
|
||||||
ess-expression-offset 2
|
ess-expression-offset 2
|
||||||
ess-nuke-trailing-whitespace-p t
|
ess-nuke-trailing-whitespace-p t
|
||||||
ess-default-style 'DEFAULT)
|
ess-default-style 'DEFAULT)
|
||||||
(when ess-disable-underscore-assign
|
|
||||||
(setq ess-smart-S-assign-key nil))
|
|
||||||
|
|
||||||
(define-key ess-doc-map "h" 'ess-display-help-on-object)
|
(define-key ess-doc-map "h" 'ess-display-help-on-object)
|
||||||
(define-key ess-doc-map "p" 'ess-R-dv-pprint)
|
(define-key ess-doc-map "p" 'ess-R-dv-pprint)
|
||||||
(define-key ess-doc-map "t" 'ess-R-dv-ctable)
|
(define-key ess-doc-map "t" 'ess-R-dv-ctable)
|
||||||
(dolist (mode '(ess-julia-mode ess-mode))
|
(dolist (mode '(ess-julia-mode ess-r-mode))
|
||||||
(spacemacs/declare-prefix-for-mode mode "ms" "repl")
|
(spacemacs/declare-prefix-for-mode mode "ms" "repl")
|
||||||
(spacemacs/declare-prefix-for-mode mode "mh" "help")
|
(spacemacs/declare-prefix-for-mode mode "mh" "help")
|
||||||
(spacemacs/declare-prefix-for-mode mode "mr" "extra")
|
(spacemacs/declare-prefix-for-mode mode "mr" "extra")
|
||||||
|
@ -130,7 +128,11 @@
|
||||||
"d" 'ess-dev-map))
|
"d" 'ess-dev-map))
|
||||||
(define-key ess-mode-map (kbd "<s-return>") 'ess-eval-line)
|
(define-key ess-mode-map (kbd "<s-return>") 'ess-eval-line)
|
||||||
(define-key inferior-ess-mode-map (kbd "C-j") 'comint-next-input)
|
(define-key inferior-ess-mode-map (kbd "C-j") 'comint-next-input)
|
||||||
(define-key inferior-ess-mode-map (kbd "C-k") 'comint-previous-input)))
|
(define-key inferior-ess-mode-map (kbd "C-k") 'comint-previous-input)
|
||||||
|
|
||||||
|
(when ess-assign-key
|
||||||
|
(define-key ess-r-mode-map ess-assign-key #'ess-insert-assign)
|
||||||
|
(define-key inferior-ess-r-mode-map ess-assign-key #'ess-insert-assign))))
|
||||||
|
|
||||||
(eval-after-load "ess-r-mode" spacemacs/ess-config)
|
(eval-after-load "ess-r-mode" spacemacs/ess-config)
|
||||||
(eval-after-load "ess-julia" spacemacs/ess-config)
|
(eval-after-load "ess-julia" spacemacs/ess-config)
|
||||||
|
@ -143,14 +145,6 @@
|
||||||
|
|
||||||
(defun ess/init-ess-R-data-view ())
|
(defun ess/init-ess-R-data-view ())
|
||||||
|
|
||||||
(defun ess/init-ess-smart-equals ()
|
|
||||||
(use-package ess-smart-equals
|
|
||||||
:defer t
|
|
||||||
:init
|
|
||||||
(progn
|
|
||||||
(add-hook 'ess-mode-hook 'ess-smart-equals-mode)
|
|
||||||
(add-hook 'inferior-ess-mode-hook 'ess-smart-equals-mode))))
|
|
||||||
|
|
||||||
(defun ess/pre-init-golden-ratio ()
|
(defun ess/pre-init-golden-ratio ()
|
||||||
(spacemacs|use-package-add-hook golden-ratio
|
(spacemacs|use-package-add-hook golden-ratio
|
||||||
:post-config
|
:post-config
|
||||||
|
|
Loading…
Reference in a new issue