Skip to content

Broke haskell-snippets into its own package. #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#
# Note: Due to MELPA distributing directly from github source version
# needs to be embedded in files as is without proprocessing.
Expand Down Expand Up @@ -28,9 +27,9 @@ INSTALL_INFO = install-info
EMACS := $(shell echo "$${EMACS:-emacs}")

EFLAGS = --eval "(add-to-list 'load-path (expand-file-name \"tests/compat\") 'append)" \
--eval "(when (< emacs-major-version 24) \
(setq byte-compile-warnings '(not cl-functions)))" \
--eval '(setq byte-compile-error-on-warn t)'
--eval "(when (< emacs-major-version 24) \
(setq byte-compile-warnings '(not cl-functions)))" \
--eval '(setq byte-compile-error-on-warn t)'

BATCH = $(EMACS) $(EFLAGS) --batch -Q -L .

Expand Down Expand Up @@ -73,7 +72,6 @@ ELFILES = \
haskell-string.el \
haskell-unicode-input-method.el \
haskell-utils.el \
haskell-yas.el \
inf-haskell.el

ELCFILES = $(ELFILES:.el=.elc)
Expand Down Expand Up @@ -114,12 +112,12 @@ dir: haskell-mode.info
haskell-mode.info: haskell-mode.texi
# Check if chapter order is same as node order
@sed -n -e '/@chapter/ s/@code{\(.*\)}/\1/' \
-e 's/@chapter \(.*\)$$/* \1::/p' \
-e 's/@unnumbered \(.*\)$$/* \1::/p' \
haskell-mode.texi > haskell-mode-menu-order.txt
-e 's/@chapter \(.*\)$$/* \1::/p' \
-e 's/@unnumbered \(.*\)$$/* \1::/p' \
haskell-mode.texi > haskell-mode-menu-order.txt
@sed -e '1,/@menu/ d' \
-e '/end menu/,$$ d' \
haskell-mode.texi > haskell-mode-content-order.txt
-e '/end menu/,$$ d' \
haskell-mode.texi > haskell-mode-content-order.txt
diff -C 1 haskell-mode-menu-order.txt haskell-mode-content-order.txt
@rm haskell-mode-menu-order.txt haskell-mode-content-order.txt

Expand Down
2 changes: 1 addition & 1 deletion haskell-customize.el
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ sure all haskell customize definitions have been loaded."
(interactive)
;; make sure all modules with (defcustom ...)s are loaded
(mapc 'require
'(haskell-checkers haskell-compile haskell-doc haskell-font-lock haskell-indentation haskell-indent haskell-interactive-mode haskell-menu haskell-process haskell-yas inf-haskell))
'(haskell-checkers haskell-compile haskell-doc haskell-font-lock haskell-indentation haskell-indent haskell-interactive-mode haskell-menu haskell-process inf-haskell))
(customize-browse 'haskell))

(provide 'haskell-customize)
70 changes: 0 additions & 70 deletions haskell-yas.el

This file was deleted.

89 changes: 0 additions & 89 deletions snippets/README.md

This file was deleted.

Empty file.
Empty file.
9 changes: 0 additions & 9 deletions snippets/haskell-mode/case

This file was deleted.

6 changes: 0 additions & 6 deletions snippets/haskell-mode/comment.block

This file was deleted.

6 changes: 0 additions & 6 deletions snippets/haskell-mode/constraint

This file was deleted.

7 changes: 0 additions & 7 deletions snippets/haskell-mode/data.inline

This file was deleted.

10 changes: 0 additions & 10 deletions snippets/haskell-mode/data.record

This file was deleted.

9 changes: 0 additions & 9 deletions snippets/haskell-mode/fn

This file was deleted.

10 changes: 0 additions & 10 deletions snippets/haskell-mode/fn.clause

This file was deleted.

11 changes: 0 additions & 11 deletions snippets/haskell-mode/fn.guarded

This file was deleted.

6 changes: 0 additions & 6 deletions snippets/haskell-mode/get

This file was deleted.

8 changes: 0 additions & 8 deletions snippets/haskell-mode/if.block

This file was deleted.

6 changes: 0 additions & 6 deletions snippets/haskell-mode/if.inline

This file was deleted.

7 changes: 0 additions & 7 deletions snippets/haskell-mode/import

This file was deleted.

9 changes: 0 additions & 9 deletions snippets/haskell-mode/import.qualified

This file was deleted.

8 changes: 0 additions & 8 deletions snippets/haskell-mode/instance

This file was deleted.

6 changes: 0 additions & 6 deletions snippets/haskell-mode/lambda

This file was deleted.

7 changes: 0 additions & 7 deletions snippets/haskell-mode/lang-pragma

This file was deleted.

6 changes: 0 additions & 6 deletions snippets/haskell-mode/let

This file was deleted.

13 changes: 0 additions & 13 deletions snippets/haskell-mode/main

This file was deleted.

Loading