From b9acbf77137b9bfaca4400cbf4b87c91aed2e331 Mon Sep 17 00:00:00 2001
From: randen <randen@users.noreply.github.com>
Date: Mon, 25 Aug 2014 17:19:17 -0700
Subject: [PATCH] Don't turn C-u into a prefix command

* elisp/ghc.el
  * There are many ways to fix issue #351 so this is
    just one example and may not fit the style you
    prefer, so please feel free to use or not.
    It is easy to work-around the issue by setting
    ghc-initial-sig-key to another key combination
    before ghc-init, but it would be nice to have a
    fix. The use of C-u for this binding seems to
    be just as a flag, thus this change takes
    the simplest fix to achieve that purpose.
---
 elisp/ghc.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/elisp/ghc.el b/elisp/ghc.el
index c541301..992db11 100644
--- a/elisp/ghc.el
+++ b/elisp/ghc.el
@@ -74,7 +74,6 @@
 (defvar ghc-shallower-key   "\C-c<")
 (defvar ghc-deeper-key      "\C-c>")
 ;(defvar ghc-case-split-key  "\C-c\C-s")
-(defvar ghc-initial-sig-key "\C-u\et")
 (defvar ghc-refine-key      "\C-c\C-f")
 (defvar ghc-auto-key        "\C-c\C-a")
 (defvar ghc-prev-hole-key   "\C-c\ep")
@@ -101,7 +100,7 @@
     (define-key haskell-mode-map ghc-previous-key    'ghc-goto-prev-error)
     (define-key haskell-mode-map ghc-next-key        'ghc-goto-next-error)
     (define-key haskell-mode-map ghc-help-key        'ghc-display-errors)
-    (define-key haskell-mode-map ghc-insert-key      'ghc-insert-template)
+    (define-key haskell-mode-map ghc-insert-key      'ghc-insert-template-or-signature)
     (define-key haskell-mode-map ghc-sort-key        'ghc-sort-lines)
     (define-key haskell-mode-map ghc-check-key       'ghc-save-buffer)
     (define-key haskell-mode-map ghc-toggle-key      'ghc-toggle-check-command)
@@ -112,7 +111,6 @@
     (define-key haskell-mode-map ghc-shallower-key   'ghc-make-indent-shallower)
     (define-key haskell-mode-map ghc-deeper-key      'ghc-make-indent-deeper)
     ;(define-key haskell-mode-map ghc-case-split-key  'ghc-case-split)
-    (define-key haskell-mode-map ghc-initial-sig-key 'ghc-initial-code-from-signature)
     (define-key haskell-mode-map ghc-refine-key      'ghc-refine)
     (define-key haskell-mode-map ghc-auto-key        'ghc-auto)
     (define-key haskell-mode-map ghc-prev-hole-key   'ghc-goto-prev-hole)
@@ -152,4 +150,10 @@
     (insert "\nEnvironment variables:\n")
     (insert (format "\tPATH=%s\n" path))))
 
+(defun ghc-insert-template-or-signature (&optional flag)
+  (interactive "P")
+  (if flag
+      (ghc-initial-code-from-signature)
+    (ghc-insert-template)))
+
 (provide 'ghc)