*** empty log message ***

2 files changed, 49 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 6c4af9c0b73..c58d16e1fa3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -970,6 +970,21 @@ will lead to undesirable results, so don't let it happen; the first
 change group you start for any given buffer should be the last one
 finished.
 
++++
+** New variable char-property-alias-alist.
+
+This variable allows you to create alternative names for text
+properties.  It works at the same level as `default-text-properties',
+although it applies to overlays as well.  This variable was introduced
+to implement the `font-lock-face' property.
+
+** New special text property `font-lock-face'.
+
+This property acts like the `face' property, but it is controlled by
+M-x font-lock-mode.  It is not, strictly speaking, a builtin text
+property.  Instead, it is implemented inside font-core.el, using the
+new variable `char-property-alias-alist'.
+
 ** New function remove-list-of-text-properties.
 
 The new function `remove-list-of-text-properties' is almost the same
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df6177b542f..b741478cd12 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2002-06-08  Colin Walters  <walters@verbum.org>
+
+        * subr.el (copy-list): Moved here from cl.el.
+        (copy-tree): Renamed here from `cl-copy-tree' in cl.el.
+
+        * replace.el (occur-mode): Don't set up categories.
+        (occur-1): Pass `list-matching-lines-face' and
+        `list-matching-lines-buffer-name-face'.
+        (occur-engine): Use `font-lock-face' instead of categories.
+
+        * info.el (Info-mode): Don't set up categories.
+        (Info-fontify-menu-headers): Use `font-lock-face' instead of categories.
+        (Info-fontify-node): Ditto.
+
+        * ibuffer.el (ibuffer-category-alist): Delete.
+        (ibuffer-get-category): Delete.
+        (ibuffer-compile-make-eliding-form): Use `font-lock-face' instead
+        of categories.
+        (ibuffer-compile-format): Don't treat `name' category specially.
+        (ibuffer-column name): Use `font-lock-face'.
+        (filename-and-process): Ditto.
+        (ibuffer-buffer-name-category): Renamed to
+        `ibuffer-buffer-name-face'.  Don't use categories.
+        (ibuffer-update-title-and-summary): Use `font-lock-face'.
+        (ibuffer-insert-filter-group): Ditto.
+        (ibuffer-mode): Don't set up categories.
+
+        * font-core.el (font-lock-category-alist): Delete.
+        (turn-on-font-lock-if-enabled): Don't use it.
+        (font-lock-symbol-category-alist): Delete.
+        (font-lock-default-function): Use new `char-property-alias-alist'
+        to make `font-lock-face' an alias for `face' when font-lock mode
+        is enabled.
+
 2002-06-08  Richard M. Stallman  <rms@gnu.org>
 
         * files.el (find-file-noselect-1): Undo previous change.