From 623d915f2199573827663a1d13275e8a9c33dcd4 Mon Sep 17 00:00:00 2001 From: Gracjan Polak Date: Fri, 13 Mar 2015 15:52:35 +0100 Subject: [PATCH] Merge hsc-mode into haskell-mode. --- Makefile | 1 - haskell-c.el | 49 ------------------------------------------------- haskell-mode.el | 2 ++ 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 haskell-c.el diff --git a/Makefile b/Makefile index f97481bdd..3367f07b0 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ ELFILES = \ haskell-align-imports.el \ haskell-bot.el \ haskell-cabal.el \ - haskell-c.el \ haskell-checkers.el \ haskell-collapse.el \ haskell-modules.el \ diff --git a/haskell-c.el b/haskell-c.el deleted file mode 100644 index 6697f760e..000000000 --- a/haskell-c.el +++ /dev/null @@ -1,49 +0,0 @@ -;;; haskell-c.el --- Major mode for *.hsc files - -;; Copyright (C) 2007 Stefan Monnier - -;; Author: Stefan Monnier - -;; This file is not part of GNU Emacs. - -;; This file is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. - -;; This file is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. - -;;; Commentary: - -;; - -;;; Code: - -(require 'haskell-mode) -(require 'haskell-font-lock) - -;;;###autoload -(add-to-list 'auto-mode-alist '("\\.hsc\\'" . haskell-c-mode)) - -(defvar haskell-c-font-lock-keywords - `(("^#[ \t]*[[:alnum:]]+" (0 font-lock-preprocessor-face)) - ,@haskell-font-lock-symbols)) - -;;;###autoload -(define-derived-mode haskell-c-mode haskell-mode "Haskell-C" - "Major mode for Haskell FFI files." - (set (make-local-variable 'font-lock-keywords) - (cons 'haskell-c-font-lock-keywords - (cdr font-lock-keywords)))) - -(provide 'haskell-c) - -;;; haskell-c.el ends here diff --git a/haskell-mode.el b/haskell-mode.el index 55feced73..768c76baa 100644 --- a/haskell-mode.el +++ b/haskell-mode.el @@ -781,6 +781,8 @@ see documentation for that variable for more details." ;;;###autoload (add-to-list 'auto-mode-alist '("\\.l[gh]s\\'" . literate-haskell-mode)) ;;;###autoload +(add-to-list 'auto-mode-alist '("\\.hsc\\'" . haskell-mode)) +;;;###autoload (add-to-list 'interpreter-mode-alist '("runghc" . haskell-mode)) ;;;###autoload (add-to-list 'interpreter-mode-alist '("runhaskell" . haskell-mode))