(asm-mode): Set comment-start properly from asm-comment-char.

(asm-font-lock-keywords): Recognize instruction width suffixes.

1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 7a2d74343fa..490b34f4b55 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -80,9 +80,9 @@
   )
 
 (defconst asm-font-lock-keywords
- '(("^\\(\\(\\sw\\|\\s_\\)+\\)\\>:?[ \t]*\\(\\sw+\\)?"
+ '(("^\\(\\(\\sw\\|\\s_\\)+\\)\\>:?[ \t]*\\(\\sw+\\(\\.[lLwWbBsS]\\)?\\)?"
     (1 font-lock-function-name-face) (3 font-lock-keyword-face nil t))
-   ("^\\s +\\(\\(\\sw\\|\\s_\\)+\\)" 1 font-lock-keyword-face))
+   ("^\\s +\\(\\(\\sw\\|\\s_\\)+\\(\\.[lLwWbBsS]\\)?\\)" 1 font-lock-keyword-face))
  "Additional expressions to highlight in Assembler mode.")
 
 (defvar asm-code-level-empty-comment-pattern nil)
@@ -133,7 +133,7 @@ Special commands:
                          ">" asm-mode-syntax-table)
   (let ((cs (regexp-quote (char-to-string asm-comment-char))))
     (make-local-variable 'comment-start)
-    (setq comment-start (concat cs " "))
+    (setq comment-start (concat (char-to-string asm-comment-char) " "))
     (make-local-variable 'comment-start-skip)
     (setq comment-start-skip (concat cs "+[ \t]*"))
     (setq asm-inline-empty-comment-pattern (concat "^.+" cs "+ *$"))