fix julia keybindings and nice prefixes

This commit is contained in:
Guido Kraemer 2017-11-27 11:46:05 +01:00 committed by bmag
parent f50626c353
commit 99d575b9c8

View file

@ -73,10 +73,26 @@
(when ess-disable-underscore-assign (when ess-disable-underscore-assign
(ess-toggle-underscore nil)) (ess-toggle-underscore nil))
(spacemacs/set-leader-keys-for-major-mode 'ess-julia-mode (define-key ess-doc-map "h" 'ess-display-help-on-object)
"'" 'julia (define-key ess-doc-map "p" 'ess-R-dv-pprint)
"si" 'julia) (define-key ess-doc-map "t" 'ess-R-dv-ctable)
(spacemacs/set-leader-keys-for-major-mode 'ess-mode (spacemacs/declare-prefix-for-mode 'ess-mode "ms" "repl")
(spacemacs/declare-prefix-for-mode 'ess-mode "me" "eval")
(spacemacs/declare-prefix-for-mode 'ess-mode "mh" "help")
(spacemacs/declare-prefix-for-mode 'ess-mode "mr" "extra")
(spacemacs/declare-prefix-for-mode 'ess-mode "mw" "pkg")
(spacemacs/declare-prefix-for-mode 'ess-mode "md" "dev")
(spacemacs/declare-prefix-for-mode 'ess-mode "mc" "noweb")
(spacemacs/declare-prefix-for-mode 'ess-julia-mode "ms" "repl")
(spacemacs/declare-prefix-for-mode 'ess-julia-mode "me" "eval")
(spacemacs/declare-prefix-for-mode 'ess-julia-mode "mh" "help")
(spacemacs/declare-prefix-for-mode 'ess-julia-mode "mr" "extra")
(spacemacs/declare-prefix-for-mode 'ess-julia-mode "mw" "pkg")
(spacemacs/declare-prefix-for-mode 'ess-julia-mode "md" "dev")
(spacemacs/declare-prefix-for-mode 'ess-julia-mode "mc" "noweb")
(dolist (mode '(ess-julia-mode ess-mode))
(spacemacs/set-leader-keys-for-major-mode
mode
"," 'ess-eval-region-or-function-or-paragraph-and-step "," 'ess-eval-region-or-function-or-paragraph-and-step
"'" 'spacemacs/ess-start-repl "'" 'spacemacs/ess-start-repl
"si" 'spacemacs/ess-start-repl "si" 'spacemacs/ess-start-repl
@ -93,12 +109,8 @@
"er" 'ess-eval-region "er" 'ess-eval-region
"sf" 'ess-eval-function-and-go "sf" 'ess-eval-function-and-go
"ef" 'ess-eval-function "ef" 'ess-eval-function
;; ESS doc map ;; predefined keymaps
"h" 'ess-doc-map "h" 'ess-doc-map
"hh" 'ess-display-help-on-object
;; R helpers
"hp" 'ess-R-dv-pprint
"ht" 'ess-R-dv-ctable
"r" 'ess-extra-map "r" 'ess-extra-map
"w" 'ess-r-package-dev-map "w" 'ess-r-package-dev-map
"d" 'ess-dev-map "d" 'ess-dev-map
@ -108,8 +120,7 @@
"cd" 'ess-eval-chunk-and-step "cd" 'ess-eval-chunk-and-step
"cm" 'ess-noweb-mark-chunk "cm" 'ess-noweb-mark-chunk
"cN" 'ess-noweb-previous-chunk "cN" 'ess-noweb-previous-chunk
"cn" 'ess-noweb-next-chunk "cn" 'ess-noweb-next-chunk))
)
(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)))