(change-log-font-lock-keywords) <function>: Add

pattern for function of change.
(change-log-font-lock-keywords) <acknowledgements>: Amalgamate
acknowledgements patterns.

2 files changed, 13 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 025d1aa43f1..f3761f342a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-31  Dave Love  <fx@gnu.org>
+
+        * add-log.el (change-log-font-lock-keywords) <function>: Add
+        pattern for function of change.
+        (change-log-font-lock-keywords) <acknowledgements>: Amalgamate
+        acknowledgements patterns.
+
 2000-05-31  Kenichi Handa  <handa@etl.go.jp>
 
         * isearch.el (isearch-printing-char): If keyboard coding system is
diff --git a/lisp/add-log.el b/lisp/add-log.el
index aeb9fb48e10..8f34c8f1f1e 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -173,11 +173,12 @@ Note: The search is conducted only within 10%, at the beginning of the file."
     ;; Conditionals.
     ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 font-lock-variable-name-face))
     ;;
+    ;; Function of change.
+    ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 font-lock-variable-name-face))
+    ;;
     ;; Acknowledgements.
-    ("^\t\\(From\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
-     1 font-lock-comment-face)
-    ("  \\(From\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
-     1 font-lock-comment-face))
+    ("\\(^\t\\|  \\)\\(From\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
+     2 font-lock-comment-face))
   "Additional expressions to highlight in Change Log mode.")
 
 (defvar change-log-mode-map (make-sparse-keymap)
@@ -536,7 +537,7 @@ Prefix arg means justify as well."
     t))
 
 (defcustom add-log-current-defun-header-regexp
-  "^\\([A-Z][A-Z_ ]*[A-Z_]\\|[-_a-zA-Z]+\\)[ \t]*[:=]"
+  "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]"
   "*Heuristic regexp used by `add-log-current-defun' for unknown major modes."
   :type 'regexp
   :group 'change-log)