# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1074091224 0
# Node ID 45ae41a57a36cef7c1e1fc08c88105dfbbb55c34
# Parent  b4eef5adebbfe181473a10e2c4f9c597ff565846
*** empty log message ***

diff -r b4eef5adebbf -r 45ae41a57a36 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 14 14:35:23 2004 +0000
+++ b/lisp/ChangeLog	Wed Jan 14 14:40:24 2004 +0000
@@ -1,3 +1,8 @@
+2004-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event):
+	Test window-system rather than system-type (for X11/Mac).
+
 2004-01-12  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* emacs-lisp/bytecomp.el (compile-defun): Doc fix.
diff -r b4eef5adebbf -r 45ae41a57a36 mac/ChangeLog
--- a/mac/ChangeLog	Wed Jan 14 14:35:23 2004 +0000
+++ b/mac/ChangeLog	Wed Jan 14 14:40:24 2004 +0000
@@ -1,13 +1,16 @@
+2004-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* src/Emacs.r: Update TOO_MUCH_RAM error message.
+
 2003-11-22  Lars Hansen <larsh@math.ku.dk>
 
 	* inc/grp.h: Added.
 
 2003-11-02  Andrew Choi  <akochoi@shaw.ca>
 
-	* src/Emacs.r [!TARGET_API_MAC_CARBON]: Don't define hfdr
-	resource.
+	* src/Emacs.r [!TARGET_API_MAC_CARBON]: Don't define hfdr resource.
 	* Emacs.app/Contents/Resources/Emacs.rsrc: Remove.
-	
+
 2003-10-31  Andrew Choi  <akochoi@shaw.ca>
 
 	* INSTALL: Add Nozomu Ando's changes to instructions for
diff -r b4eef5adebbf -r 45ae41a57a36 src/ChangeLog
--- a/src/ChangeLog	Wed Jan 14 14:35:23 2004 +0000
+++ b/src/ChangeLog	Wed Jan 14 14:40:24 2004 +0000
@@ -1,3 +1,16 @@
+2004-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* alloc.c (struct interval_block, struct string_block)
+	(struct symbol_block, struct marker_block, live_string_p)
+	(live_cons_p, live_symbol_p, live_float_p, live_misc_p):
+	Better preserve alignment for objects in blocks.
+	(FLOAT_BLOCK_SIZE): Adjust for possible alignment padding.
+
+	* lread.c (defvar_per_buffer): Remove dead declaration.
+
+	* macterm.c (do_check_ram_size): Don't hardcode the lisp address
+	space size.
+
 2004-01-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xmenu.c (popup_get_selection): Check new parameter down_on_keypress