el/dot-emacs.el: Use post-local-variables hook to set asm comment char.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 32188f94e048a0a7c80b7e95b54c822414ddecb8..7eddea546b9d39ba4519eca4cb7e6b3d82ca025e 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -2214,20 +2214,17 @@ (defun mdw-fontify-icon ()
 (defun mdw-fontify-asm ()
   (modify-syntax-entry ?' "\"")
   (modify-syntax-entry ?. "w")
-  (modify-syntax-entry ?; "."
-                      )
-  (modify-syntax-entry asm-comment-char "<b")
   (modify-syntax-entry ?\n ">")
   (setf fill-prefix nil)
   (mdw-standard-fill-prefix "\\([ \t]*;+[ \t]*\\)"))
 
-(define-derived-mode x86-asm-mode asm-mode "x86 assembler"
-  "Assembler mode variant which uses `#' as the comment character."
-  (set (make-variable-buffer-local 'asm-comment-char) ?#))
-
-(define-derived-mode arm-asm-mode asm-mode "ARM assembler"
-  "Assembler mode variant which uses `@' as the comment character."
-  (set (make-variable-buffer-local 'asm-comment-char) ?@))
+(defun mdw-asm-set-comment ()
+  (modify-syntax-entry ?; "."
+                      )
+  (modify-syntax-entry asm-comment-char "<b")
+  (setq comment-start (string asm-comment-char ? )))
+(add-hook 'asm-mode-local-variables-hook 'mdw-asm-set-comment)
+(put 'asm-comment-char 'safe-local-variable 'characterp)
 
 ;;;--------------------------------------------------------------------------
 ;;; TCL configuration.