From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 24 Nov 2001 16:42:15 +0000 (+0000)
Subject: Install entry from 2001-11-20 that had unnoticed conflicts.
X-Git-Tag: ttn-vms-21-2-B4~18234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=febf36a1cc2cbb5ab9b9905c7e7f150cd2bab3a6;p=emacs.git

Install entry from 2001-11-20 that had unnoticed conflicts.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c32bae6850..9301d007acf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -99,6 +99,13 @@
 
 	* replace.el (occur-mode): Undo 2001-5-20 change.
 
+2001-11-20  Jason Rumney  <jasonr@gnu.org>
+
+	* w32-fns.el (w32-system-coding-system): Change to an alias for
+	locale-coding-system.
+	(set-w32-system-coding-system): Document the above change.
+	Set locale-coding-system instead.
+
 2001-11-20  Richard M. Stallman  <rms@gnu.org>
 
 	* ruler-mode.el: Add pagination.