summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasatake YAMATO <jet@gyve.org>2006-04-26 07:03:20 +0000
committerMasatake YAMATO <jet@gyve.org>2006-04-26 07:03:20 +0000
commitc1b639ecf63ee980a463dd4433a6845bf899b1b9 (patch)
tree30346711e25560cbb0f651a944eb4d0c1ed0a21c
parentc9fcbd819738bf1c1666e27d167fd7492f2cc309 (diff)
downloademacs-c1b639ecf63ee980a463dd4433a6845bf899b1b9.tar.gz
(asm-mode, asm-mode-syntax-table): Add
support for "//" style comments. Remove `b' flag from ?* in `asm-mode-syntax-table'.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/asm-mode.el10
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20e75092251..cf365abbeee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-26 Masatake YAMATO <jet@gyve.org>
+
+ * progmodes/asm-mode.el (asm-mode, asm-mode-syntax-table):
+ Add support for "//" style comments. Remove `b' flag
+ from ?* in `asm-mode-syntax-table'.
+
2006-04-26 Stefan Monnier <monnier@iro.umontreal.ca>
* follow.el: Use (featurep 'xemacs) everywhere.
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index b79237adba7..ebb532a3525 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -62,9 +62,9 @@
(defvar asm-mode-syntax-table
(let ((st (make-syntax-table)))
- (modify-syntax-entry ?\n ">" st)
- (modify-syntax-entry ?/ ". 14b" st)
- (modify-syntax-entry ?* ". 23b" st)
+ (modify-syntax-entry ?\n "> b" st)
+ (modify-syntax-entry ?/ ". 124b" st)
+ (modify-syntax-entry ?* ". 23" st)
st)
"Syntax table used while in Asm mode.")
@@ -136,14 +136,14 @@ Special commands:
(use-local-map (nconc (make-sparse-keymap) asm-mode-map))
(local-set-key (vector asm-comment-char) 'asm-comment)
(set-syntax-table (make-syntax-table asm-mode-syntax-table))
- (modify-syntax-entry asm-comment-char "<")
+ (modify-syntax-entry asm-comment-char "< b")
(make-local-variable 'comment-start)
(setq comment-start (string asm-comment-char))
(make-local-variable 'comment-add)
(setq comment-add 1)
(make-local-variable 'comment-start-skip)
- (setq comment-start-skip "\\(?:\\s<+\\|/\\*+\\)[ \t]*")
+ (setq comment-start-skip "\\(?:\\s<+\\|/[/*]+\\)[ \t]*")
(make-local-variable 'comment-end-skip)
(setq comment-end-skip "[ \t]*\\(\\s>\\|\\*+/\\)")
(make-local-variable 'comment-end)