# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 993551701 0
# Node ID c96885865dda19b97b0b848eaee95fa5a9927f08
# Parent  6eaa11a41f8a1788aa896e5e97ea8aef028df15c
*** empty log message ***

diff -r 6eaa11a41f8a -r c96885865dda etc/PROBLEMS
--- a/etc/PROBLEMS	Tue Jun 26 10:34:27 2001 +0000
+++ b/etc/PROBLEMS	Tue Jun 26 10:35:01 2001 +0000
@@ -1,6 +1,17 @@
 This file describes various problems that have been encountered
 in compiling, installing and running GNU Emacs.
 
+* Emacs hangs when changing the default font
+
+This has been reported for fvwm 2.2.5 and the window manager of KDE
+2.1.  The reason for the hang is that Xt waits indefinitely for a
+ConfigureNotify event from the window manager.  A workaround is to add
+something like
+
+emacs.waitForWM: false
+
+to your X resources.
+
 * Underlines appear at the wrong position.
 
 This is caused by fonts having a wrong UNDERLINE_POSITION property.
diff -r 6eaa11a41f8a -r c96885865dda lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jun 26 10:34:27 2001 +0000
+++ b/lisp/ChangeLog	Tue Jun 26 10:35:01 2001 +0000
@@ -1,3 +1,11 @@
+2001-06-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mail/rmail.el (rmail-msg-restore-non-pruned-header): New
+	function.
+	(rmail-msg-prune-header): Likewise.
+	(rmail-toggle-header): Use `rmail-msg-restore-non-pruned-header'
+	and `rmail-msg-prune-header'.
+
 2001-06-25  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* textmodes/fill.el (fill-region-as-paragraph): Don't look further
diff -r 6eaa11a41f8a -r c96885865dda src/ChangeLog
--- a/src/ChangeLog	Tue Jun 26 10:34:27 2001 +0000
+++ b/src/ChangeLog	Tue Jun 26 10:35:01 2001 +0000
@@ -1,3 +1,16 @@
+2001-06-26  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (handle_invisible_prop): Deal with overlay strings at
+	the start of invisible text.
+	(setup_for_ellipsis): New function.
+	(next_overlay_string): After all overlay strings have been
+	processed, display an ellipsis if necessary.
+	(load_overlay_strings, get_overlay_strings): Add parameter CHARPOS.
+	(push_it): Initialize display_ellipsis_p on the iterator's stack.
+
+	* dispextern.h (struct iterator_stack_entry): Add member
+	display_ellipsis_p.
+
 2001-06-25  Gerd Moellmann  <gerd@gnu.org>
 
 	* widget.c (EmacsFrameSetCharSize): Set XtNwaitForWm depending