# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 973026425 0
# Node ID bbf383648e4da54e237dfbcdcfd02a2de727e157
# Parent  10379d59910e895c0b36c8b77626b39dc029a175
*** empty log message ***

diff -r 10379d59910e -r bbf383648e4d etc/NEWS
--- a/etc/NEWS	Tue Oct 31 21:06:51 2000 +0000
+++ b/etc/NEWS	Tue Oct 31 21:07:05 2000 +0000
@@ -1452,6 +1452,10 @@
 VC Dired buffers are now kept up-to-date during all version control
 operations.
 
+`vc-diff' output is now displayed in `diff-mode'.
+`vc-print-log' uses `log-view-mode'.
+`vc-log-mode' (used for *VC-Log*) has been replaced by `log-edit-mode'.
+
 *** Changes for CVS
 
 There is a new user option, `vc-cvs-stay-local'.  If it is `t' (the
@@ -1946,6 +1950,8 @@
 ** The function `subr-arity' provides information on the argument list
 of a primitive.
 
+** `where-is-internal' now also accepts a list of keymaps.
+
 ** The text property `keymap' specifies a key map which overrides the
 buffer's local map and the map specified by the `local-map' property.
 This is probably what most current uses of `local-map' want, rather
@@ -1957,8 +1963,8 @@
 ** The function `apropos-mode' runs the hook `apropos-mode-hook'.
 
 +++
-** `concat' no longer accepts individual integer arguments, as
-promised long ago.
+** `concat' no longer accepts individual integer arguments,
+as promised long ago.
 
 ** The new function `float-time' returns the current time as a float.
 
diff -r 10379d59910e -r bbf383648e4d lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 31 21:06:51 2000 +0000
+++ b/lisp/ChangeLog	Tue Oct 31 21:07:05 2000 +0000
@@ -1,3 +1,7 @@
+2000-10-31  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* cus-edit.el (custom-mode-map): Switch back to a sparse keymap.
+
 2000-10-31  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* ediff-init.el (ediff-prepare-buffer-hook): Expand docstring, no
@@ -27,8 +31,7 @@
 	(ps-page-number): Changed from defmacro to defun.
 	(ps-header-sheet, ps-header-page): Fix bug on selected pages for
 	printing.
-	(ps-print-ensure-fontified): Ensure fontification when jit-lock is
-	on.
+	(ps-print-ensure-fontified): Ensure fontification when jit-lock is on.
 	(ps-end-file, ps-dummy-page): Funs eliminated.
 	(ps-print-color-scale): Changed default value.
 	(ps-page-n-up, ps-print-page-p): New internal vars.
@@ -41,14 +44,12 @@
 
 2000-10-31  Kenichi Handa  <handa@etl.go.jp>
 
-	* term/mac-win.el: (decode-mac-roman, encode-mac-roman)
-	(mac-roman): Moved to european.el.
+	* term/mac-win.el (decode-mac-roman, encode-mac-roman, mac-roman):
+	Moved to european.el.
 	(ccl-encode-mac-roman-font, fontset-mac): Modified for
 	mule-unicode-2500-33ff and mule-unicode-e000-ffff.
-	(mac-roman-kbd-insert, mac-roman-kbd-mode): These functions
-	deleted.
-	(mac-roman-kbd-mode, mac-roman-kbd-mode-map): These variables
-	deleted.
+	(mac-roman-kbd-insert, mac-roman-kbd-mode): These functions deleted.
+	(mac-roman-kbd-mode, mac-roman-kbd-mode-map): These variables deleted.
 
 2000-10-30  Dave Love  <fx@gnu.org>