From e90cc5d1c73bcdd0e3d7c7cdc1520c19d634f939 Mon Sep 17 00:00:00 2001 From: Fice T Date: Sat, 6 Feb 2016 16:48:43 -0600 Subject: [PATCH] Make all define-key calls use kbd --- doc/haskell-mode.texi | 2 +- haskell-indent.el | 14 +++++++------- haskell-navigate-imports.el | 2 +- haskell.el | 4 ++-- inf-haskell.el | 20 ++++++++++---------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/haskell-mode.texi b/doc/haskell-mode.texi index 4f7293cc8..9b37d4a97 100644 --- a/doc/haskell-mode.texi +++ b/doc/haskell-mode.texi @@ -263,7 +263,7 @@ To jump to your import list, run It's nicer to have a keybinding to do this, for example: @lisp -(define-key haskell-mode-map [f8] 'haskell-navigate-imports) +(define-key haskell-mode-map (kbd "") 'haskell-navigate-imports) @end lisp You can hit it repeatedly to jump between groups of imports. It will diff --git a/haskell-indent.el b/haskell-indent.el index 7d3b9a157..0075f46f9 100644 --- a/haskell-indent.el +++ b/haskell-indent.el @@ -1499,15 +1499,15 @@ One indentation cycle is used." ;; (define-key map "\177" 'backward-delete-char-untabify) ;; The binding to TAB is already handled by indent-line-function. --Stef ;; (define-key map "\t" 'haskell-indent-cycle) - (define-key map [?\C-c ?\C-=] 'haskell-indent-insert-equal) - (define-key map [?\C-c ?\C-|] 'haskell-indent-insert-guard) + (define-key map (kbd "C-c C-=") 'haskell-indent-insert-equal) + (define-key map (kbd "C-c C-|") 'haskell-indent-insert-guard) ;; Alternate binding, in case C-c C-| is too inconvenient to type. ;; Duh, C-g is a special key, let's not use it here. - ;; (define-key map [?\C-c ?\C-g] 'haskell-indent-insert-guard) - (define-key map [?\C-c ?\C-o] 'haskell-indent-insert-otherwise) - (define-key map [?\C-c ?\C-w] 'haskell-indent-insert-where) - (define-key map [?\C-c ?\C-.] 'haskell-indent-align-guards-and-rhs) - (define-key map [?\C-c ?\C->] 'haskell-indent-put-region-in-literate) + ;; (define-key map (kbd "C-c C-g") 'haskell-indent-insert-guard) + (define-key map (kbd "C-c C-o") 'haskell-indent-insert-otherwise) + (define-key map (kbd "C-c C-w") 'haskell-indent-insert-where) + (define-key map (kbd "C-c C-.") 'haskell-indent-align-guards-and-rhs) + (define-key map (kbd "C-c C->") 'haskell-indent-put-region-in-literate) map)) ;;;###autoload diff --git a/haskell-navigate-imports.el b/haskell-navigate-imports.el index 65a90154c..6a4e250ac 100644 --- a/haskell-navigate-imports.el +++ b/haskell-navigate-imports.el @@ -36,7 +36,7 @@ ;; Example usage: ;; (require 'haskell-navigate-imports) -;; (define-key haskell-mode-map [f8] 'haskell-navigate-imports) +;; (define-key haskell-mode-map (kbd "") 'haskell-navigate-imports) ;;; Code: diff --git a/haskell.el b/haskell.el index a454c54d6..0651d09a3 100644 --- a/haskell.el +++ b/haskell.el @@ -53,8 +53,8 @@ (define-key map (kbd "C-c C-c") 'haskell-process-cabal-build) (define-key map (kbd "C-c v c") 'haskell-cabal-visit-file) (define-key map (kbd "C-c C-x") 'haskell-process-cabal) - (define-key map [?\C-c ?\C-b] 'haskell-interactive-switch) - (define-key map [?\C-c ?\C-z] 'haskell-interactive-switch) + (define-key map (kbd "C-c C-b") 'haskell-interactive-switch) + (define-key map (kbd "C-c C-z") 'haskell-interactive-switch) (define-key map (kbd "M-n") 'haskell-goto-next-error) (define-key map (kbd "M-p") 'haskell-goto-prev-error) (define-key map (kbd "C-c M-p") 'haskell-goto-first-error) diff --git a/inf-haskell.el b/inf-haskell.el index 3fb96a4b2..6cdd3bd01 100644 --- a/inf-haskell.el +++ b/inf-haskell.el @@ -797,24 +797,24 @@ we load it." (defvar inf-haskell-mode-map (let ((map (make-sparse-keymap))) - ;; (define-key map [?\M-C-x] 'inferior-haskell-send-defun) - ;; (define-key map [?\C-x ?\C-e] 'inferior-haskell-send-last-sexp) - ;; (define-key map [?\C-c ?\C-r] 'inferior-haskell-send-region) - (define-key map [?\C-x ?\C-d] 'inferior-haskell-send-decl) - (define-key map [?\C-c ?\C-z] 'switch-to-haskell) - (define-key map [?\C-c ?\C-l] 'inferior-haskell-load-file) + ;; (define-key map (kbd "M-C-x") 'inferior-haskell-send-defun) + ;; (define-key map (kbd "C-x C-e") 'inferior-haskell-send-last-sexp) + ;; (define-key map (kbd "C-c C-r") 'inferior-haskell-send-region) + (define-key map (kbd "C-x C-d") 'inferior-haskell-send-decl) + (define-key map (kbd "C-c C-z") 'switch-to-haskell) + (define-key map (kbd "C-c C-l") 'inferior-haskell-load-file) ;; I think it makes sense to bind inferior-haskell-load-and-run to C-c ;; C-r, but since it used to be bound to `reload' until June 2007, I'm ;; going to leave it out for now. - ;; (define-key map [?\C-c ?\C-r] 'inferior-haskell-load-and-run) - (define-key map [?\C-c ?\C-b] 'switch-to-haskell) - ;; (define-key map [?\C-c ?\C-s] 'inferior-haskell-start-process) + ;; (define-key map (kbd "C-c C-r") 'inferior-haskell-load-and-run) + (define-key map (kbd "C-c C-b") 'switch-to-haskell) + ;; (define-key map (kbd "C-c C-s") 'inferior-haskell-start-process) ;; That's what M-; is for. (define-key map (kbd "C-c C-t") 'inferior-haskell-type) (define-key map (kbd "C-c C-i") 'inferior-haskell-info) (define-key map (kbd "C-c M-.") 'inferior-haskell-find-definition) (define-key map (kbd "C-c C-d") 'inferior-haskell-find-haddock) - (define-key map [?\C-c ?\C-v] 'haskell-check) + (define-key map (kbd "C-c C-v") 'haskell-check) map) "Keymap for using inf-haskell.")