aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2003-01-23 09:12:03 +0000
committerJuanma Barranquero2003-01-23 09:12:03 +0000
commit18255677080f78d5a654d5eccb02a7b0fb2e5c4f (patch)
tree45c7dfdd4552ecd63e8fd920e90bb5a63ff29924
parent99f01c91bc65227544638a2ad436bb076cb4e00e (diff)
downloademacs-18255677080f78d5a654d5eccb02a7b0fb2e5c4f.tar.gz
emacs-18255677080f78d5a654d5eccb02a7b0fb2e5c4f.zip
(asm-mode): Added syntax table entries for /* */ comments.
-rw-r--r--lisp/ChangeLog13
-rw-r--r--lisp/progmodes/asm-mode.el12
2 files changed, 17 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2abf062c8b3..c052e0806b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-01-23 Masatake YAMATO <jet@gyve.org>
2
3 * progmodes/asm-mode.el (asm-mode): Added syntax table entries for
4 /* */ comments.
5
12003-01-23 Kenichi Handa <handa@m17n.org> 62003-01-23 Kenichi Handa <handa@m17n.org>
2 7
3 * files.el (insert-directory): Read the output of "ls" by 8 * files.el (insert-directory): Read the output of "ls" by
@@ -82,7 +87,7 @@
82 * progmodes/octave-mod.el (octave-mode-map): Change C-c i bindings 87 * progmodes/octave-mod.el (octave-mode-map): Change C-c i bindings
83 to C-c C-i. Duplicate its bindings with last char a ctl char. 88 to C-c C-i. Duplicate its bindings with last char a ctl char.
84 Also change C-c f to C-c C-f. 89 Also change C-c f to C-c C-f.
85 90
862003-01-20 Markus Rost <rost@math.ohio-state.edu> 912003-01-20 Markus Rost <rost@math.ohio-state.edu>
87 92
88 * ls-lisp.el (ls-lisp-use-insert-directory-program): Make default 93 * ls-lisp.el (ls-lisp-use-insert-directory-program): Make default
@@ -206,7 +211,7 @@
206 * loadup.el: Include lisp/textmodes in load-path for bootstrap 211 * loadup.el: Include lisp/textmodes in load-path for bootstrap
207 emacs, to resolve ispell menu reference. 212 emacs, to resolve ispell menu reference.
208 213
2092003-01-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> (tiny change) 2142003-01-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> (tiny change)
210 215
211 * international/mule.el (optimize-char-coding-system-table): 216 * international/mule.el (optimize-char-coding-system-table):
212 Optimize it. 217 Optimize it.
@@ -906,7 +911,7 @@
906 (tooltip-gud-process-output): Undo previous change. 911 (tooltip-gud-process-output): Undo previous change.
907 (tooltip-strip-annotations): Remove. 912 (tooltip-strip-annotations): Remove.
908 913
9092002-12-22 Zoltan Kemenczy <zoltan@ieee.org> 9142002-12-22 Zoltan Kemenczy <zoltan@ieee.org>
910 915
911 * gud.el (gud-menu-map): Add jdb support for "run". 916 * gud.el (gud-menu-map): Add jdb support for "run".
912 (gud-jdb-find-source-using-classpath): Use 'identity. 917 (gud-jdb-find-source-using-classpath): Use 'identity.
@@ -1276,7 +1281,7 @@
1276 * files.el (find-file-read-args): Reenable wildcard processing 1281 * files.el (find-file-read-args): Reenable wildcard processing
1277 unconditionally. 1282 unconditionally.
1278 1283
12792002-12-06 Robert J. Chassell <bob@rattlesnake.com> 12842002-12-06 Robert J. Chassell <bob@rattlesnake.com>
1280 1285
1281 * textmodes/texinfmt.el (texinfo-format-scan): Handle new 1286 * textmodes/texinfmt.el (texinfo-format-scan): Handle new
1282 functions for copyright notice and copying permissions. 1287 functions for copyright notice and copying permissions.
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index a18c856d569..6feded31b7f 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -128,9 +128,13 @@ Special commands:
128 (local-set-key (vector asm-comment-char) 'asm-comment) 128 (local-set-key (vector asm-comment-char) 'asm-comment)
129 129
130 (modify-syntax-entry asm-comment-char 130 (modify-syntax-entry asm-comment-char
131 "<" asm-mode-syntax-table) 131 "< b" asm-mode-syntax-table)
132 (modify-syntax-entry ?\n 132 (modify-syntax-entry ?\n
133 ">" asm-mode-syntax-table) 133 "> b" asm-mode-syntax-table)
134
135 (modify-syntax-entry ?/ ". 14" asm-mode-syntax-table)
136 (modify-syntax-entry ?* ". 23" asm-mode-syntax-table)
137
134 (let ((cs (regexp-quote (char-to-string asm-comment-char)))) 138 (let ((cs (regexp-quote (char-to-string asm-comment-char))))
135 (make-local-variable 'comment-start) 139 (make-local-variable 'comment-start)
136 (setq comment-start (concat (char-to-string asm-comment-char) " ")) 140 (setq comment-start (concat (char-to-string asm-comment-char) " "))
@@ -213,13 +217,13 @@ repeatedly until you are satisfied with the kind of comment."
213 (insert asm-comment-char)) 217 (insert asm-comment-char))
214 218
215 ;; Empty code-level comment already present? 219 ;; Empty code-level comment already present?
216 ;; Then start flush-left comment, on line above if this one is nonempty. 220 ;; Then start flush-left comment, on line above if this one is nonempty.
217 ((asm-line-matches asm-code-level-empty-comment-pattern) 221 ((asm-line-matches asm-code-level-empty-comment-pattern)
218 (asm-pop-comment-level) 222 (asm-pop-comment-level)
219 (insert asm-comment-char asm-comment-char comment-start)) 223 (insert asm-comment-char asm-comment-char comment-start))
220 224
221 ;; Empty comment ends line? 225 ;; Empty comment ends line?
222 ;; Then make code-level comment, on line above if this one is nonempty. 226 ;; Then make code-level comment, on line above if this one is nonempty.
223 ((asm-line-matches asm-inline-empty-comment-pattern) 227 ((asm-line-matches asm-inline-empty-comment-pattern)
224 (asm-pop-comment-level) 228 (asm-pop-comment-level)
225 (tab-to-tab-stop) 229 (tab-to-tab-stop)