[Pkg-haskell-commits] darcs: ghc-mod: remove haskell-mode-hook to use ghc-mod's C-cC-t

[kiwamu at debian.or.jp]

Sun Mar  4 14:30:41 UTC 2012  kiwamu at debian.or.jp
  * remove haskell-mode-hook to use ghc-mod's C-cC-t
  Ignore-this: f0a4dee09d94e205e793feab270ec323

     ./emacsen-startup -> ./ghc-mod.emacsen-startup
    M ./changelog +7
    M ./ghc-mod.emacsen-startup +3
    M ./rules -3 +1

Sun Mar  4 14:30:41 UTC 2012  kiwamu at debian.or.jp
  * remove haskell-mode-hook to use ghc-mod's C-cC-t
  Ignore-this: f0a4dee09d94e205e793feab270ec323
diff -rN -u old-ghc-mod//changelog new-ghc-mod//changelog
--- old-ghc-mod//changelog	2012-03-04 14:33:41.394297328 +0000
+++ new-ghc-mod//changelog	2012-03-04 14:33:41.398294690 +0000
@@ -1,3 +1,10 @@
+ghc-mod (1.10.10-2) unstable; urgency=low
+
+  * /etc/emacs/site-start.d/51ghc-mod.el:
+    + remove haskell-mode-hook to use ghc-mod's C-cC-t.
+
+ -- Kiwamu Okabe <kiwamu at debian.or.jp>  Sun, 04 Mar 2012 23:27:48 +0900
+
 ghc-mod (1.10.10-1) unstable; urgency=low
 
   * Imported Upstream version 1.10.10.
diff -rN -u old-ghc-mod//emacsen-startup new-ghc-mod//emacsen-startup
--- old-ghc-mod//emacsen-startup	2012-03-04 14:33:41.394297328 +0000
+++ new-ghc-mod//emacsen-startup	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-;; -*-emacs-lisp-*-
-(setq load-path (cons (concat "/usr/share/"
-                              (symbol-name debian-emacs-flavor)
-			      "/site-lisp/ghc-mod") load-path))
-
-(autoload 'ghc-init "ghc" nil t)
-(add-hook 'haskell-mode-hook (lambda () (ghc-init) (flymake-mode)))
diff -rN -u old-ghc-mod//ghc-mod.emacsen-startup new-ghc-mod//ghc-mod.emacsen-startup
--- old-ghc-mod//ghc-mod.emacsen-startup	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc-mod//ghc-mod.emacsen-startup	2012-03-04 14:33:41.402751920 +0000
@@ -0,0 +1,10 @@
+;; -*-emacs-lisp-*-
+(setq load-path (cons (concat "/usr/share/"
+                              (symbol-name debian-emacs-flavor)
+			      "/site-lisp/ghc-mod") load-path))
+
+(autoload 'ghc-init "ghc" nil t)
+(add-hook 'haskell-mode-hook (lambda () (ghc-init) (flymake-mode)))
+
+; ghc-mod's C-cC-t conflict with haskell-doc-mode
+(remove-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
diff -rN -u old-ghc-mod//rules new-ghc-mod//rules
--- old-ghc-mod//rules	2012-03-04 14:33:41.394297328 +0000
+++ new-ghc-mod//rules	2012-03-04 14:33:41.402751920 +0000
@@ -2,9 +2,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
-# How to install an extra file into the documentation package
-#binary-fixup/libghc-ghc-mod-doc::
-#	echo "Some informative text" > debian/libghc-ghc-mod-doc/usr/share/doc/libghc-ghc-mod-doc/AnExtraDocFile
+DEB_EMACS_PRIORITY = 51
 
 build/ghc-mod :: build-ghc-stamp