From 5f27067eb6ffb9ae96d503a70d46977b12dcdf23 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Sun, 12 Jun 2016 22:22:26 +0200 Subject: New key bindings: C-c C-c, C-c C-l --- README | 3 +++ doc/cheat.texi | 12 ++++++++++++ elisp/geiser-mode.el | 8 ++++---- elisp/geiser-repl.el | 1 + 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/README b/README index ad956dc..ae7b8ad 100644 --- a/README +++ b/README @@ -105,6 +105,7 @@ | C-c C-e [ | Toggle between () and [] for current form | |-------------+-------------------------------------------------| | C-M-x | Eval definition around point | + | C-c C-c | Eval definition around point | | C-c M-e | Eval definition around point and switch to REPL | | C-x C-e | Eval sexp before point | | C-c C-r | Eval region | @@ -117,6 +118,7 @@ | C-c C-m r | Macro-expand region | |-------------+-------------------------------------------------| | C-c C-k | Compile and load current file | + | C-c C-l | Load scheme file | |-------------+-------------------------------------------------| | C-c C-d d | See documentation for identifier at point | | C-c C-d s | See short documentation for identifier at point | @@ -139,6 +141,7 @@ | C-c C-z | Start Scheme REPL, or jump to previous buffer | | C-c M-o | Clear scheme output | | C-c C-q | Kill Scheme process | + | C-c C-l | Load scheme file | | C-c C-k | Nuke REPL: use it if the REPL becomes unresponsive | |-------------+----------------------------------------------------| | M-. | Edit identifier at point | diff --git a/doc/cheat.texi b/doc/cheat.texi index 3dd0f8d..793d20f 100644 --- a/doc/cheat.texi +++ b/doc/cheat.texi @@ -49,9 +49,15 @@ third key not modified by @key{Control}; e.g., @item C-M-x @tab @code{geiser-eval-definition} @tab Eval definition around point +@item C-c C-c +@tab @code{geiser-eval-definition} +@tab Eval definition around point @item C-c M-e @tab @code{geiser-eval-definition-and-go} @tab Eval definition around point and switch to REPL +@item C-c M-c +@tab @code{geiser-eval-definition-and-go} +@tab Eval definition around point and switch to REPL @item C-x C-e @tab @code{geiser-eval-last-sexp} @tab Eval sexp before point @@ -81,6 +87,9 @@ third key not modified by @key{Control}; e.g., @item C-c C-k @tab @code{geiser-compile-current-buffer} @tab Compile and load current file +@item C-c C-l +@tab @code{geiser-load-file} +@tab Load scheme file @item M-g n, C-x ` @tab @code{next-error} @tab Jump to the location of next error @@ -139,6 +148,9 @@ third key not modified by @key{Control}; e.g., @item M-. @tab @code{geiser-edit-symbol-at-point} @tab Edit identifier at point +@item C-c C-l +@tab @code{geiser-load-file} +@tab Load scheme file @item TAB @tab @code{geiser-repl-tab-dwim} @tab Complete, indent, or go to next error diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el index 4ca8af2..d0f184e 100644 --- a/elisp/geiser-mode.el +++ b/elisp/geiser-mode.el @@ -328,15 +328,15 @@ interacting with the Geiser REPL is at your disposal. (geiser-menu--defmenu geiserm geiser-mode-map ("Eval sexp before point" "\C-x\C-e" geiser-eval-last-sexp) - ("Eval definition" "\M-\C-x" geiser-eval-definition) - ("Eval definition and go" "\C-c\M-e" geiser-eval-definition-and-go) + ("Eval definition" ("\M-\C-x" "\C-c\C-c") geiser-eval-definition) + ("Eval definition and go" ("\C-c\M-e" "\C-c\M-e") + geiser-eval-definition-and-go) ("Eval region" "\C-c\C-r" geiser-eval-region :enable mark-active) ("Eval region and go" "\C-c\M-r" geiser-eval-region-and-go geiser-eval-region :enable mark-active) ("Eval buffer" "\C-c\C-b" geiser-eval-buffer) ("Eval buffer and go" "\C-c\M-b" geiser-eval-buffer-and-go) -;; ("Compile definition" "\C-c\M-c" geiser-compile-definition) -;; ("Compile definition and go" "\C-c\C-c" geiser-compile-definition-and-go) + ("Load scheme file..." "\C-c\C-l" geiser-load-file) (menu "Macroexpand" ("Sexp before point" ("\C-c\C-m\C-e" "\C-c\C-me") geiser-expand-last-sexp) diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el index d79f503..0cee34f 100644 --- a/elisp/geiser-repl.el +++ b/elisp/geiser-repl.el @@ -710,6 +710,7 @@ buffer." ("Edit symbol" "\M-." geiser-edit-symbol-at-point :enable (geiser--symbol-at-point)) -- + ("Load scheme file..." "\C-c\C-l" geiser-load-file) ("Switch to module..." "\C-c\C-m" switch-to-geiser-module) ("Import module..." "\C-c\C-i" geiser-repl-import-module) ("Add to load path..." "\C-c\C-r" geiser-add-to-load-path) -- cgit v1.2.3