# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 960725905 0
# Node ID f973bf66d32173ab256f84a72da49a1e775ae316
# Parent  ec45256eb9619534a737fbd4353a3fc277dee790
*** empty log message ***

diff -r ec45256eb961 -r f973bf66d321 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jun 11 12:14:57 2000 +0000
+++ b/lisp/ChangeLog	Sun Jun 11 12:18:25 2000 +0000
@@ -1,3 +1,7 @@
+2000-06-11  Gerd Moellmann  <gerd@gnu.org>
+
+	* term/x-win.el (x-colors): Add colors from recent rgb.txt.
+
 2000-06-11  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* imenu.el (imenu-generic-expression): Docstring fix.
diff -r ec45256eb961 -r f973bf66d321 man/files.texi
--- a/man/files.texi	Sun Jun 11 12:14:57 2000 +0000
+++ b/man/files.texi	Sun Jun 11 12:18:25 2000 +0000
@@ -316,6 +316,7 @@
 Save any or all buffers in their visited files (@code{save-some-buffers}).
 @item M-~
 Forget that the current buffer has been changed (@code{not-modified}).
+With prefix argument (@kbd{C-u}), mark the current buffer as changed.
 @item C-x C-w
 Save the current buffer in a specified file (@code{write-file}).
 @item M-x set-visited-file-name
diff -r ec45256eb961 -r f973bf66d321 src/ChangeLog
Binary file src/ChangeLog has changed