# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1028311381 0
# Node ID 6f3953a83c05a5da154e86470b12cd03416fc8a5
# Parent  703592d3b794dffe3c02c5a4fe3bd3626f14e870
*** empty log message ***

diff -r 703592d3b794 -r 6f3953a83c05 etc/NEWS
--- a/etc/NEWS	Fri Aug 02 18:02:17 2002 +0000
+++ b/etc/NEWS	Fri Aug 02 18:03:01 2002 +0000
@@ -85,8 +85,11 @@
 want to make the buffer writable.  (As root, you will in fact be able
 to alter the file.)
 
+** The new command `revert-buffer-with-coding-system' (C-x RET r)
+revisits the current file using a coding system that you specify.
+
 ---
-** ps-print can now print Unicode characters.
+** `ps-print' can now print Unicode characters.
 
 Printing text with characters from the mule-unicode-* sets works with
 ps-print, provided that you have installed the appropriate BDF fonts.
@@ -1017,6 +1020,9 @@
 for it.  (If the coding system is detected incorrectly for a specific
 file, you can put a `coding:' tags to override it.)
 
+** The new function `merge-coding-systems' fills in unspecified aspects
+of one coding system from another coding system.
+
 ** The variable `safe-local-eval-forms' specifies a list of forms that
 are ok to evaluate when they appear in an `eval' local variables
 specification.  Normally Emacs asks for confirmation before evaluating
diff -r 703592d3b794 -r 6f3953a83c05 etc/PROBLEMS
--- a/etc/PROBLEMS	Fri Aug 02 18:02:17 2002 +0000
+++ b/etc/PROBLEMS	Fri Aug 02 18:03:01 2002 +0000
@@ -2,6 +2,11 @@
 in compiling, installing and running GNU Emacs.
 
 
+* Emacs reports a BadAtom error (from X) running on Solaris 7 or 8.
+
+This happens when Emacs was built on some other version of Solaris.
+Rebuild it on Solaris 8.
+
 * Mule-UCS loads very slowly.
 
 Changes to Emacs internals interact badly with Mule-UCS's `un-define'
@@ -456,7 +461,7 @@
 shared version of libjpeg, which you need to install.  Finally, rerun
 the Emacs configure script, which should now find the jpeg library.
 Alternatively, modify the generated src/Makefile to link the .a file
-explicitly.
+explicitly, and edit src/config.h to define HAVE_JPEG.
 
 * Building Emacs over NFS fails with ``Text file busy''.
 
diff -r 703592d3b794 -r 6f3953a83c05 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Aug 02 18:02:17 2002 +0000
+++ b/lisp/ChangeLog	Fri Aug 02 18:03:01 2002 +0000
@@ -1,3 +1,21 @@
+2002-08-02  Richard M. Stallman  <rms@gnu.org>
+
+	* international/mule.el (merge-coding-systems): New function.
+	(set-buffer-file-coding-system): Use merge-coding-systems.
+	Change prompt for args.
+	(revert-buffer-with-coding-system): New command.
+
+	* international/mule-cmds.el (mule-keymap, set-coding-system-map): 
+	Add bindings for revert-buffer-with-coding-system.
+	(set-coding-system-map): Clarify menu item info for
+	set-buffer-file-coding-system.
+	(set-coding-system-map): Reorder and add separators.
+
+	* emacs-lisp/edebug.el (edebug-eval-top-level-form):
+	Use eval-expression.
+
+	* subr.el (atomic-change-group): Doc fix.
+
 2002-07-31  Colin Walters  <walters@debian.org>
 
 	* ibuffer.el (ibuffer-hooks): Rename to `ibuffer-hook'; Add