(asm-font-lock-keywords): Allow arbitrary

words separated by dots.  Match optional parenthesized word at
start of line.

2 files changed, 14 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4226ed987e9..28cf0a9ae65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-02  Andreas Schwab  <schwab@suse.de>
+
+        * progmodes/asm-mode.el (asm-font-lock-keywords): Allow arbitrary
+        words separated by dots.  Match optional parenthesized word at
+        start of line.
+
+        * font-lock.el
+        (font-lock-match-c-style-declaration-item-and-skip-to-next):
+        Don't require underscore in word before double open-paren.
+
 2003-02-02  John Paul Wallington  <jpw@gnu.org>
 
         * hexl.el (hexl-mode-map): Bind C-m to `hexl-self-insert-command'.
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 6feded31b7f..96b14596f6b 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -1,6 +1,6 @@
 ;;; asm-mode.el --- mode for editing assembler code
 
-;; Copyright (C) 1991 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 2003 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -80,9 +80,10 @@
   )
 
 (defconst asm-font-lock-keywords
- '(("^\\(\\(\\sw\\|\\s_\\)+\\)\\>:?[ \t]*\\(\\sw+\\(\\.[lLwWbBsS]\\)?\\)?"
+ '(("^\\(\\(\\sw\\|\\s_\\)+\\)\\>:?[ \t]*\\(\\sw+\\(\\.\\sw+\\)*\\)?"
     (1 font-lock-function-name-face) (3 font-lock-keyword-face nil t))
-   ("^\\s +\\(\\(\\sw\\|\\s_\\)+\\(\\.[lLwWbBsS]\\)?\\)" 1 font-lock-keyword-face))
+   ("^\\((\\sw+)\\)?\\s +\\(\\(\\sw\\|\\s_\\)+\\(\\.\\sw+\\)*\\)"
+    2 font-lock-keyword-face))
  "Additional expressions to highlight in Assembler mode.")
 
 (defvar asm-code-level-empty-comment-pattern nil)