*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index b8b8a9b9702d051cec5db96839f6d8a2e9c16be6..e1577144ad6d0e31ec160b5d48bbac464bb7c53b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -36,7 +36,7 @@ be put below text lines on the affected frame or frames.
 - By setting X resource `lineSpacing', class `LineSpacing'.  This is
 equivalent ot specifying the frame parameter.
 
-- By specifying `--line-spaceing=N' or `-lsp N' on the command line.
+- By specifying `--line-spacing=N' or `-lsp N' on the command line.
 
 - By setting buffer-local variable `line-spacing'.  The meaning is
 the same, but applies to the a particular buffer only.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c46a4a94cdcb300a6799a08704fdc1aa75ea39e9..f3870aa517daf57add15aa89bba5e1c17c8111ea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-11  Gerd Moellmann  <gerd@gnu.org>
+
+       * subr.el (substitute-key-definition): Add comment describing
+       the meaning of PREFIX.
+
 2000-05-10  Stefan Monnier  <monnier@cs.yale.edu>
 
        * emacs-lisp/regexp-opt.el (regexp-opt-depth): Fix regexp.

diff --git a/src/ChangeLog b/src/ChangeLog
index caba058c0a32bc87b6739c86565940d92720bff9..f1ee8e0db8fa6574947d041e8ec7411270a01463 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-11  Gerd Moellmann  <gerd@gnu.org>
+
+       * xdisp.c (handle_single_display_prop): Don't try to set PT if
+       we're interating over a string.
+
 2000-05-09  Dave Love  <fx@gnu.org>
 
        * fileio.c (Fwrite_region): If APPEND arg is an integer, seek to