*** empty log message ***

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index fd1ea15f0fdc9906a186e0ba5e0bf93992e36ccf..40220a0a9167094f0602a840995a78ae6e05a8c5 100644 (file)
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68b4411d45979c8292d79277b07fe85a3b62f76a..07c27f3f46c4f1583a67749b5f5c0131180dd869 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 59f7ca34653fd5139e29df86c3d8dc80ca83e18c..6e51be5b1c76cbb449fdf33527a6514d36d4bbae 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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