       (append (list nil "~/")
               load-path))
 
+<<<<<<< HEAD
 (load "~/haskell-mode-2.7.0/haskell-site-file")
+=======
+(load "~/haskell-mode-2.4/haskell-site-file")
+>>>>>>> 9047102cc7a111c3d013184a0e7202f178b35999
 
 ;(require 'w3m-e21)
 ;(provide 'w3m-e23)
 (setq x-select-enable-clipboard t)
 (setq interprogram-paste-function 'x-cut-buffer-or-selection-value)
 
-(defadvice save-buffers-kill-emacs (around no-query-kill-emacs activate)
-        "Prevent annoying \"Active processes exist\" query when you quit Emacs."
-        (flet ((process-list ())) ad-do-it))
-
 (autoload 'magit-status "magit" nil t)
 (global-set-key [(ctrl f12)]       'magit-status)
 (delete-selection-mode 1)

(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
(add-hook 'haskell-mode-hook 'font-lock-mode)
;;(add-hook 'haskell-mode-hook 'haskell-indentation-mode)
;;(require 'column-marker)
;;(autoload 'column-marker "/home/tomn/column-marker" "Cycle forward." t)
;;(add-hook 'find-file-hook (lambda () (interactive) (column-marker-1 80)))
(add-hook 'haskell-mode-hook (lambda () (interactive) (column-marker-1 81)))

;;       smtpmail-smtp-server "smtp.gmail.com"
;;       smtpmail-smtp-service 587
;;       smtpmail-local-domain "le.ac.uk")


;; (define-derived-mode bugpan-mode haskell-mode 
;;      "bugpan-mode" 
;;      "A variant of Haskell mode"
;;      (font-lock-add-keywords nil '(("[0-9]" . 'c3-face-1)))
;;     )