Replace ess-smart-underscore with ess-smart-equals
Add rainbow-delimiters hook, add R-mode to auto-mode-alist, add convenience keybinding, and add edit default offsets. Separate rainbow-delimiters and smart-equals hooks into own defuns.
This commit is contained in:
parent
ab0f7014c0
commit
d5b3785733
|
@ -15,7 +15,8 @@
|
|||
ess
|
||||
ess-R-data-view
|
||||
ess-R-object-popup
|
||||
ess-smart-underscore
|
||||
ess-smart-equals
|
||||
rainbow-delimiters
|
||||
)
|
||||
"List of all packages to install and/or initialize. Built-in packages
|
||||
which require an initialization must be listed explicitly in the list.")
|
||||
|
@ -30,7 +31,7 @@ which require an initialization must be listed explicitly in the list.")
|
|||
(defun load-ess-on-demand ()
|
||||
(interactive)
|
||||
(use-package ess-site)
|
||||
(use-package ess-smart-underscore)
|
||||
(use-package ess-smart-equals)
|
||||
(use-package ess-R-object-popup)
|
||||
(use-package ess-R-data-view)
|
||||
)
|
||||
|
@ -39,6 +40,13 @@ which require an initialization must be listed explicitly in the list.")
|
|||
;; R --------------------------------------------------------------------------
|
||||
(eval-after-load "ess-site"
|
||||
'(progn
|
||||
(add-to-list 'auto-mode-alist '("\\.R$" . R-mode))
|
||||
;; Follow Hadley Wickham's R style guide
|
||||
(setq ess-first-continued-statement-offset 2
|
||||
ess-continued-statement-offset 0
|
||||
ess-expression-offset 2
|
||||
ess-nuke-trailing-whitespace-p t
|
||||
ess-default-style 'DEFAULT)
|
||||
(evil-leader/set-key-for-mode 'ess-mode
|
||||
"mi" 'R
|
||||
;; noweb
|
||||
|
@ -64,5 +72,13 @@ which require an initialization must be listed explicitly in the list.")
|
|||
"msT" 'ess-eval-function-and-go
|
||||
"mst" 'ess-eval-function
|
||||
)
|
||||
(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-k") 'comint-previous-input))))
|
||||
|
||||
(defun ess/init-rainbow-delimiters ()
|
||||
(add-hook 'ess-mode-hook #'rainbow-delimiters-mode))
|
||||
|
||||
(defun ess/init-ess-smart-equals ()
|
||||
(add-hook 'ess-mode-hook 'ess-smart-equals-mode)
|
||||
(add-hook 'inferior-ess-mode-hook 'ess-smart-equals-mode))
|
||||
|
|
Loading…
Reference in a new issue