move defpackage to lisp-font-lock-keywords-1

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 0882eb7436fd2d9306930b6aecfcc169b1bfc481..4db863c2af054c51be310b245073647cfc4547f7 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1913,7 +1913,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
                   ;; Variable declarations.
                   "\\(const\\|custom\\|face\\|var\\)\\|"
                   ;; Structure declarations.
-                  "\\(class\\|group\\|struct\\|type\\)"
+                  "\\(class\\|group\\|package\\|struct\\|type\\)"
                   "\\)\\)\\>"
                   ;; Any whitespace and defined object.
                   "[ \t'\(]*"
@@ -1957,7 +1957,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
             "(" (regexp-opt
                  '("when" "unless" "case" "ecase" "typecase" "etypecase"
                    "loop" "do" "do*" "dotimes" "dolist"
-                   "proclaim" "declaim" "declare" "defpackage"
+                   "proclaim" "declaim" "declare"
                    "lexical-let" "lexical-let*" "flet" "labels"
                    "return" "return-from") t)
             "\\>")