From c9d76d4770ffc21aae81692a213b48b9e86315a1 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Mon, 14 Jun 2010 22:31:13 +0200 Subject: Better keybindings for documentation browser --- README | 26 ++++++++++++-------------- elisp/geiser-doc.el | 21 ++++++++++++++------- elisp/geiser-popup.el | 3 +-- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/README b/README index 271bb02..3c5ef4a 100644 --- a/README +++ b/README @@ -149,21 +149,19 @@ *** In the documentation browser: - |-----------+----------------------------------------------| - | C-c C-f | next page | - | C-c C-b | previous page | - | SPC/S-SPC | scroll up/down | - | TAB/S-TAB | next/previous link | - | C-c C-k | kill current page and go to previous or next | - | C-c C-r | refresh page | - | C-c C-c | clean browsing history | - | M-. | edit identifier at point | - | C-cz | switch to REPL | - | q | bury buffer | - |-----------+----------------------------------------------| + |------------+----------------------------------------------| + | n, f | Next page | + | p, b | Previous page | + | TAB, S-TAB | Next/previous link | + | k | Kill current page and go to previous or next | + | g, r | Refresh page | + | c | Clear browsing history | + | ., M-. | Edit identifier at point | + | z | Switch to REPL | + | q | Bury buffer | + |------------+----------------------------------------------| *** In backtrace (evaluation/compile result) buffers: - - Default error navigation keys used by Emacs' compilation mode - (e.g. M-g n, M-g p for next/previous error). + - TAB, M-TAB for error navigation. - q to bury buffer. diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el index 5684e54..cf7b7a7 100644 --- a/elisp/geiser-doc.el +++ b/elisp/geiser-doc.el @@ -255,7 +255,6 @@ With prefix argument, ask for symbol (with completion)." (symbol-at-point))))) (when symbol (geiser-doc-symbol symbol)))) - (defun geiser-doc-module (&optional module impl) "Display information about a given module." (interactive) @@ -353,16 +352,24 @@ With prefix, the current page is deleted from history." (defun geiser-doc--visible-p () ) (geiser-menu--defmenu doc geiser-doc-mode-map - ("Next" "\C-c\C-f" geiser-doc-next "Next item" + ("Next page" ("n" "f") geiser-doc-next "Next item" :enable (geiser-doc--history-next-p)) - ("Previous" "\C-c\C-b" geiser-doc-previous "Previous item" + ("Previous page" ("p" "b") geiser-doc-previous "Previous item" :enable (geiser-doc--history-previous-p)) - ("Refresh" "\C-c\C-r" geiser-doc-refresh "Refresh current page") + ("Next link" nil forward-button) + ("Previous link" nil backward-button) + ("Go to REPL" ("z" "\C-cz" "\C-\C-z") switch-to-geiser) + ("Refresh" ("g" "r") geiser-doc-refresh "Refresh current page") + -- + ("Edit symbol" ("." "\M-.") geiser-doc-edit-symbol-at-point + :enable (symbol-at-point)) + -- + ("Kill item" "k" geiser-doc-kill-page "Kill this page") + ("Clear history" "c" geiser-doc-clean-history) -- - ("Kill item" "\C-c\C-k" geiser-doc-kill-page "Kill this page") - ("Clean history" "\C-c\C-c" geiser-doc-clean-history) + (custom "Browser options" geiser-doc) -- - (custom "Browser options" geiser-doc)) + ("Quit" nil View-quit)) (defun geiser-doc-mode () "Major mode for browsing scheme documentation. diff --git a/elisp/geiser-popup.el b/elisp/geiser-popup.el index 35be4f6..a9a7b5f 100644 --- a/elisp/geiser-popup.el +++ b/elisp/geiser-popup.el @@ -16,9 +16,8 @@ (defvar geiser-popup--registry nil) -(defvar geiser-popup--overriding-map +(setq geiser-popup--overriding-map (let ((map (make-sparse-keymap))) - (define-key map "\r" nil) (define-key map "q" 'View-quit) map)) -- cgit v1.2.3