branch: elpa/raku-mode
commit 759b21553f028cd68df2bd5d51eebc1e0b1bb33f
Author: Matias Linares <[email protected]>
Commit: Matias Linares <[email protected]>
Fix keybinds and menu
---
perl6-mode.el | 19 +++++++++++++++----
perl6-repl.el | 20 --------------------
2 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/perl6-mode.el b/perl6-mode.el
index 878e2db228..e21e8cb353 100644
--- a/perl6-mode.el
+++ b/perl6-mode.el
@@ -38,15 +38,27 @@
:prefix "perl6-"
:group 'language)
-(defvar perl6-mode-map nil "Keymap for `perl6-mode'")
-
-
(require 'perl6-detect)
(require 'perl6-font-lock)
(require 'perl6-indent)
(require 'perl6-imenu)
(require 'perl6-repl)
+(defvar perl6-mode-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map (kbd "C-c C-c") 'perl6-send-line-to-repl)
+ (define-key map (kbd "C-c C-r") 'perl6-send-region-to-repl)
+ (define-key map (kbd "C-c C-h") 'perl6-send-buffer-to-repl)
+ map)
+ "Keymap for `perl6-mode'")
+
+(easy-menu-define perl6-mode-menu perl6-mode-map
+ "Menu for `perl6-mode'"
+ '("Raku"
+ ["Send line to repl" perl6-send-line-to-repl]
+ ["Send region to repl" perl6-send-region-to-repl]
+ ["Send buffer to repl" perl6-send-buffer-to-repl]))
+
;;;###autoload
(define-derived-mode perl6-mode prog-mode "Perl6"
"Major mode for editing Perl 6 code."
@@ -58,7 +70,6 @@
;; Add imenu support for perl6-mode. Note that imenu-generic-expression
;; is buffer-local, so we don't need a local-variable for it.
(add-hook 'perl6-mode-hook 'imenu-add-menubar-index)
- (add-hook 'perl6-mode-hook 'perl6-repl--initialize-menu)
(setq imenu-generic-expression perl6-imenu-generic-expression
imenu-case-fold-search nil)
;; Comments
diff --git a/perl6-repl.el b/perl6-repl.el
index 543cfe75a6..249b0bf18a 100644
--- a/perl6-repl.el
+++ b/perl6-repl.el
@@ -92,25 +92,5 @@
(select-window cwin)
(switch-to-buffer cbuf)))
-;; Menu for evaluation
-(defun perl6-repl--initialize-menu ()
- (interactive)
- (define-key-after
- perl6-mode-map
- [menu-bar perl6-interaction]
- (cons "Raku Interaction" (make-sparse-keymap "Perl6 Interaction"))
- 'tools)
- (define-key
- perl6-mode-map
- [menu-bar perl6-interaction eval-line]
- '("Evaluate line" . perl6-send-line-to-repl))
- (define-key
- perl6-mode-map
- [menu-bar perl6-interaction eval-region]
- '("Evaluate region" . perl6-send-region-to-repl))
- (define-key
- perl6-mode-map
- [menu-bar perl6-interaction eval-buffer]
- '("Evaluate buffer" . perl6-send-buffer-to-repl)))
(provide 'perl6-repl)
