*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 464b9f60b03e39f94fc75bd0ca43651f957828a2..9d0c92f510967627e6e4781c58bb259e00138ebe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/mac/ChangeLog b/mac/ChangeLog
index 52c6d0512db8aa21ed5ee2e56fa883adabf59e25..aa6e9844feefbef9fe47af45435a24e48c83e06e 100644 (file)
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 9c21defd658219d499b403e917f00117f42e51a6..1b6625073585bb2909be4e2bbfdb6f2b780185e9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xmenu.c (popup_get_selection): Check new parameter down_on_keypress