From caa5e5ce6c09fb44cc1fe824cc4ec9ebfa5cc5b1 Mon Sep 17 00:00:00 2001 From: Iku Iwasa Date: Sun, 8 Feb 2015 10:46:40 +0900 Subject: [PATCH 1/2] Follow Emacs key binding convention Not to use C-c letter bindings. --- haskell-cabal.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-cabal.el b/haskell-cabal.el index 91c75051a..53ef8e0ef 100644 --- a/haskell-cabal.el +++ b/haskell-cabal.el @@ -117,7 +117,7 @@ (add-to-list 'auto-mode-alist '("\\.cabal\\'" . haskell-cabal-mode)) (defvar haskell-cabal-mode-map (make-sparse-keymap)) -(define-key haskell-cabal-mode-map (kbd "C-c s") +(define-key haskell-cabal-mode-map (kbd "C-c C-s") 'haskell-cabal-subsection-arrange-lines) (define-key haskell-cabal-mode-map (kbd "C-M-n") 'haskell-cabal-next-section) (define-key haskell-cabal-mode-map (kbd "C-M-p") @@ -129,7 +129,7 @@ 'haskell-cabal-next-subsection) (define-key haskell-cabal-mode-map (kbd "C-") 'haskell-cabal-previous-subsection) -(define-key haskell-cabal-mode-map (kbd "C-c f") +(define-key haskell-cabal-mode-map (kbd "C-c C-f") 'haskell-cabal-find-or-create-source-file) (define-key haskell-cabal-mode-map (kbd "M-g l") 'haskell-cabal-goto-library-section) From 032d8a29592a3e949ec459c790f11bf625707494 Mon Sep 17 00:00:00 2001 From: Iku Iwasa Date: Sun, 8 Feb 2015 10:54:02 +0900 Subject: [PATCH 2/2] Format haskell-cabal-mode keymap definitions --- haskell-cabal.el | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/haskell-cabal.el b/haskell-cabal.el index 53ef8e0ef..dfe6dfed6 100644 --- a/haskell-cabal.el +++ b/haskell-cabal.el @@ -116,29 +116,22 @@ ;;;###autoload (add-to-list 'auto-mode-alist '("\\.cabal\\'" . haskell-cabal-mode)) +(defvar haskell-cabal-mode-map + (let ((map (make-sparse-keymap))) + (define-key map (kbd "C-c C-s") 'haskell-cabal-subsection-arrange-lines) + (define-key map (kbd "C-M-n") 'haskell-cabal-next-section) + (define-key map (kbd "C-M-p") 'haskell-cabal-previous-section) + (define-key map (kbd "M-n") 'haskell-cabal-next-subsection) + (define-key map (kbd "M-p") 'haskell-cabal-previous-subsection) + (define-key map (kbd "C-") 'haskell-cabal-next-subsection) + (define-key map (kbd "C-") 'haskell-cabal-previous-subsection) + (define-key map (kbd "C-c C-f") 'haskell-cabal-find-or-create-source-file) + (define-key map (kbd "M-g l") 'haskell-cabal-goto-library-section) + (define-key map (kbd "M-g e") 'haskell-cabal-goto-executable-section) + (define-key map (kbd "M-g b") 'haskell-cabal-goto-benchmark-section) + (define-key map (kbd "M-g t") 'haskell-cabal-goto-test-suite-section) + map)) (defvar haskell-cabal-mode-map (make-sparse-keymap)) -(define-key haskell-cabal-mode-map (kbd "C-c C-s") - 'haskell-cabal-subsection-arrange-lines) -(define-key haskell-cabal-mode-map (kbd "C-M-n") 'haskell-cabal-next-section) -(define-key haskell-cabal-mode-map (kbd "C-M-p") - 'haskell-cabal-previous-section) -(define-key haskell-cabal-mode-map (kbd "M-n") 'haskell-cabal-next-subsection) -(define-key haskell-cabal-mode-map (kbd "M-p") - 'haskell-cabal-previous-subsection) -(define-key haskell-cabal-mode-map (kbd "C-") - 'haskell-cabal-next-subsection) -(define-key haskell-cabal-mode-map (kbd "C-") - 'haskell-cabal-previous-subsection) -(define-key haskell-cabal-mode-map (kbd "C-c C-f") - 'haskell-cabal-find-or-create-source-file) -(define-key haskell-cabal-mode-map (kbd "M-g l") - 'haskell-cabal-goto-library-section) -(define-key haskell-cabal-mode-map (kbd "M-g e") - 'haskell-cabal-goto-executable-section) -(define-key haskell-cabal-mode-map (kbd "M-g b") - 'haskell-cabal-goto-benchmark-section) -(define-key haskell-cabal-mode-map (kbd "M-g t") - 'haskell-cabal-goto-test-suite-section) ;;;###autoload (define-derived-mode haskell-cabal-mode fundamental-mode "Haskell-Cabal"