summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/TUTORIAL7
-rw-r--r--src/ChangeLog9
2 files changed, 14 insertions, 2 deletions
diff --git a/etc/TUTORIAL b/etc/TUTORIAL
index ca10ec20b23..21433d11456 100644
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -699,6 +699,9 @@ top of the file is on the screen, it will say --Top-- instead of
--Bot--. If you are looking at text so small that all of it fits on
the screen, the mode line says --All--.
+The L and digits indicate position in another way: they give the
+current line number of point.
+
The stars near the front mean that you have made changes to the text.
Right after you visit or save a file, that part of the mode line shows
no stars, just dashes.
@@ -948,7 +951,7 @@ The most basic HELP feature is C-h c. Type C-h, the character c, and
a command character or sequence; then Emacs displays a very brief
description of the command.
->> Type C-h c Control-p.
+>> Type C-h c C-p.
The message should be something like
C-p runs the command previous-line
@@ -964,7 +967,7 @@ EDIT or ALT key) <ESC>v are also allowed after C-h c.
To get more information about a command, use C-h k instead of C-h c.
->> Type C-h k Control-p.
+>> Type C-h k C-p.
This displays the documentation of the function, as well as its
name, in an Emacs window. When you are finished reading the
diff --git a/src/ChangeLog b/src/ChangeLog
index 0794cfba3cc..f32e82bc3b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-02 Gerd Moellmann <gerd@gnu.org>
+
+ * xfaces.c (realize_x_face): When copying BASE_FACE bitwise to the
+ result face, set flags in the face indicating that colors may not
+ be freed.
+
+ * xterm.c (x_set_mouse_face_gc): If first glyph isn't a character
+ glyph, use the ASCII NUL character to determine the face.
+
2000-06-02 Dave Love <fx@gnu.org>
* sysdep.c: Conditionally include stdlib.h, unistd.h.