*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index c58d16e1fa3baa4b965eeca405984ce92cf2dc4f..2fc545d49334a2d41b468e27bbec384c924be135 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -293,9 +293,11 @@ screen size.  (For now, this does not work with some window managers.)
 
 ** shell-mode now supports programmable completion using `pcomplete'.
 
-** Emacs now tries to set up buffer coding systems for XML files
+** Emacs now tries to set up buffer coding systems for HTML/XML files
 automatically.  This is accomplished using the general mechanism of a
-new variable called `auto-coding-functions', which you may add to.
+new variable called `auto-coding-functions', which you may add to.  If
+the coding system is detected incorrectly, you may use coding: tags to
+override them.
 
 ** The new command `comint-input-previous-argument' in comint-derived
 modes (shell-mode etc) inserts arguments from previous command lines,

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b741478cd1222145d63c3dbeacb4b77e809fcfd5..b12ea87e299e2bc679d06d2af022949c44b023b7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,26 @@
+2002-06-08  Colin Walters  <walters@gnu.org>
+
+       * international/mule-diag.el (describe-char-after): Use
+       `font-lock-face' to italicize property names.
+
+       * international/mule.el (sgml-html-meta-auto-coding-function): New
+       function.
+       (auto-coding-from-file-contents): Delete; merge functionality into
+       `set-auto-coding'.
+       (set-auto-coding): Move tests from `auto-coding-functions' so that
+       they have a lower priority than coding: tags.  Put
+       `auto-coding-regexp-alist' tests before coding: tag tests.
+       (sgml-xml-auto-coding-function): Simply `intern' the match, and
+       test if it's a valid coding system.
+       (auto-coding-functions): Add `sgml-html-meta-auto-coding-function'.
+
 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.
+       (copy-tree): Renamed here from `cl-copy-tree' in cl-extra.el.
+       
+       * emacs-lisp/cl-extra.el (cl-copy-tree): Moved to `copy-tree' in
+       subr.el.  Add a defalias with the old name.
 
        * replace.el (occur-mode): Don't set up categories.
        (occur-1): Pass `list-matching-lines-face' and

diff --git a/src/ChangeLog b/src/ChangeLog
index b7e0b51e497ba3e4ad23bd690f0cdd2284fc8200..1347eca1626a59707a73d62f268d2de53b869f8d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-08  Colin Walters  <walters@verbum.org>
+
+       * textprop.c (Vchar_property_alias_alist): New variable.
+       (syms_of_textprop) <Vchar_property_alias_alist>: DEFVAR_LISP. 
+
+       * intervals.c (lookup_char_property): New function for looking up
+       overlay and text properties, created from textget.
+       (textget): Use it.
+       
+       * intervals.h (lookup_char_property): Declare.
+       (Vchar_property_alias_alist): Declare.
+
+       * buffer.c (Foverlay_get): Use lookup_char_property.
+
 2002-06-07  Sam Steingold  <sds@gnu.org>
 
        * xselect.c (lisp_data_to_selection_data): Fix last change: