upstream

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7eb18593993..ceed28a7a7f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2011-08-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c (parse_image_spec): Check for nonnegative, not for positive,
+        when checking :margin (Bug#9390).
+        (IMAGE_NON_NEGATIVE_INTEGER_VALUE_OR_PAIR):
+        Renamed from IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,
+        so that the name doesn't mislead.  All uses changed.
+
+2011-08-28  Johan Bockgård  <bojohan@gnu.org>
+
+        * term.c (init_tty) [HAVE_GPM]: Move mouse settings after
+        set_tty_hooks.
+
+2011-08-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_to): Don't bail out early when reaching
+        position beyond to_charpos, if we are scanning backwards.
+        (move_it_vertically_backward): When DY == 0, make sure we get to
+        the first character in the line after the newline.
+
 2011-08-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         * ccl.c: Improve and simplify overflow checking (Bug#9196).