*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a44099bfb8ede5ef8fa8eba35e7a2930b7c8a0c6..39a352dfbc7d5c4317919148dcbdf1572f3446fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/files.texi b/man/files.texi
index ce4d37fe538dd25b8175094fd8bdc8cb4a2da662..26b3adb99562a5f1290f39d851a3b14d0b2cb88c 100644 (file)
--- a/man/files.texi
+++ b/man/files.texi
@@ -316,6 +316,7 @@ Save the current buffer in its visited file (@code{save-buffer}).
 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 --git a/src/ChangeLog b/src/ChangeLog
index 593aaa36695e9cc96be4903f859b9ee7b55e043d..b55b0487a3381f225814201abc2d00a4a5cb417e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-11  Gerd Moellmann  <gerd@gnu.org>
+
+       * xmenu.c (xmenu_show): Case second parameter of lw_popup_menu
+       to `XEvent *'.
+
 2000-06-10  Kenichi Handa  <handa@etl.go.jp>
 
        * regex.c (MAKE_CHAR) [!emacs]: Dummy macro for non-Emacs env.
@@ -24,7 +29,7 @@
 2000-06-08  Gerd Moellmann  <gerd@gnu.org>
 
        * xterm.c (XTread_socket) <FocusIn>: Queue a FOCUS_IN_EVENT which
-       will be translated to a switch-frame event in when reading the
+       will be translated to a switch-frame event when reading the
        event queue.  This is necessary because Emacs otherwise won't
        perform a switch-frame to a new frame until some other event, for
        example a keystroke event, forces it to do so.  This has various