From a39c79abd8b88f5299bb7204429f658cb6554776 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 9 Sep 2016 19:26:21 +0200
Subject: [PATCH] Add (mips|haxor|nasm)-mode to module-asm.el

---
 Cask                  |  5 +++++
 modules/module-asm.el | 20 +++++---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Cask b/Cask
index 2cafe65c9..a5bcaa407 100644
--- a/Cask
+++ b/Cask
@@ -142,6 +142,11 @@
 
 
 ;;;; MODULES ;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Assembly -- modules/module-asm.el
+(depends-on "mips-mode")
+(depends-on "haxor-mode")
+(depends-on "nasm-mode")
+
 ;; C/C++ -- modules/module-cc.el
 (depends-on "cmake-mode")
 (depends-on "company-irony")
diff --git a/modules/module-asm.el b/modules/module-asm.el
index e3d678e28..4e1de3be6 100644
--- a/modules/module-asm.el
+++ b/modules/module-asm.el
@@ -1,20 +1,10 @@
 ;;; module-asm.el
 
-(use-package asm-mode
-  :commands (mips-mode)
-  :mode ("\\.mips" . mips-mode)
-  :config
-  (define-derived-mode mips-mode asm-mode "MIPS"
-    "Major mode for editing MIPS assembler code."
-    ;; Unset ; key.
-    (local-unset-key (vector asm-comment-char))
-    (set (make-local-variable #'asm-comment-char) ?#)
-    (local-set-key (vector asm-comment-char) #'asm-comment)
-    ;; Update syntax for new comment char.
-    (set-syntax-table (make-syntax-table asm-mode-syntax-table))
-    (modify-syntax-entry asm-comment-char "< b")
-    ;; Fix one level comments.
-    (set (make-local-variable #'comment-start) (string asm-comment-char))))
+(use-package mips-mode :mode "\\.mips$")
+
+(use-package haxor-mode :mode "\\.hax$")
+
+(use-package nasm-mode :defer t)
 
 (provide 'module-asm)
 ;;; module-asm.el ends here