# HG changeset patch
# User Colin Walters <walters@gnu.org>
# Date 1023570400 0
# Node ID b31ffbdd8d114695f52f673860d15cfa47f8e502
# Parent  5981072a9e22931f0ac5a267713075f2fbcb23bd
*** empty log message ***

diff -r 5981072a9e22 -r b31ffbdd8d11 etc/NEWS
--- a/etc/NEWS	Sat Jun 08 21:03:00 2002 +0000
+++ b/etc/NEWS	Sat Jun 08 21:06:40 2002 +0000
@@ -293,9 +293,11 @@
 
 ** 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 -r 5981072a9e22 -r b31ffbdd8d11 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jun 08 21:03:00 2002 +0000
+++ b/lisp/ChangeLog	Sat Jun 08 21:06:40 2002 +0000
@@ -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 -r 5981072a9e22 -r b31ffbdd8d11 src/ChangeLog
--- a/src/ChangeLog	Sat Jun 08 21:03:00 2002 +0000
+++ b/src/ChangeLog	Sat Jun 08 21:06:40 2002 +0000
@@ -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: