From: Kim F. Storm <storm@cua.dk>
Date: Mon, 4 Oct 2004 14:13:38 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~4731
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0207b8ad25094fdcd48660eb29db2991f6462f2a;p=emacs.git

*** empty log message ***
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 981fd88ba3a..29d160da55b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-04  Kim F. Storm  <storm@cua.dk>
+
+	* DEBUG: Mention pp and ff commands.
+
 2004-09-26  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* enriched.doc: `enriched-annotation-alist' is now called
diff --git a/src/ChangeLog b/src/ChangeLog
index bc2de24804f..8f6b2297692 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-04  Kim F. Storm  <storm@cua.dk>
 
+	* fringe.c (Ffringe_bitmaps_at_pos): Change return value from cons
+	to list.  Include overlay arrow bitmap in return value.
+
 	* xterm.c (XTset_vertical_scroll_bar): Improve handling of scroll
 	bars with fractional column width.  If scroll bar separates two
 	windows, move it towards the window it belongs to.  Only update